evolix/evodocker
22
0
Fork 1
Code Issues Pull requests Packages Releases Wiki Activity

Change way apache2-php for buster/stretch too
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details

Browse source
This commit is contained in:
Ludovic Poujol 2024-04-25 18:08:53 +02:00
parent afa4b99a8a
commit 3c88061401
Signed by: lpoujol
SSH key fingerprint: SHA256:YZbQWfjHONnvIGkFZMs0xRKtqzqGqwtZU+kCOKhZXPA
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
.Jenkinsfile
View file

@ -92,12 +92,12 @@ pipeline {
}
}
stage('Build apache2-php ') {
stage('Build apache2-php') {
parallel {
stage('Build apache2-php (Stretch)') {
steps {
script {
def deb = docker.build("evolix/redis:deb9build${env.BUILD_ID}", "-f apache2-php/stretch/Dockerfile .")
def deb = docker.build("evolix/apache2-php:deb9build${env.BUILD_ID}", "apache2-php/stretch/")
deb.inside {
sh 'echo Test needed'
}
@ -121,7 +121,7 @@ pipeline {
stage('Build apache2-php (Buster)') {
steps {
script {
def deb = docker.build("evolix/apache2-php:deb10build${env.BUILD_ID}", "-f apache2-php/buster/Dockerfile .")
def deb = docker.build("evolix/apache2-php:deb10build${env.BUILD_ID}", "apache2-php/buster/")
deb.inside {
sh 'echo Test needed'
}

4
apache2-php/buster/Dockerfile
View file

@ -22,8 +22,8 @@ RUN apt-get update \
ca-certificates \
&& rm -rf /var/lib/apt/lists/*
COPY apache2-php/stretch/apache-evolinux-defaults.conf /etc/apache2/conf-available
COPY apache2-php/stretch/php-evolinux-defaults.ini /etc/php/7.0/apache2/conf.d
COPY apache-evolinux-defaults.conf /etc/apache2/conf-available
COPY php-evolinux-defaults.ini /etc/php/7.0/apache2/conf.d
RUN a2enconf apache-evolinux-defaults
RUN a2enmod rewrite remoteip headers

4
apache2-php/stretch/Dockerfile
View file

@ -23,8 +23,8 @@ RUN apt-get update \
ca-certificates \
&& rm -rf /var/lib/apt/lists/*
COPY apache2-php/stretch/apache-evolinux-defaults.conf /etc/apache2/conf-available
COPY apache2-php/stretch/php-evolinux-defaults.ini /etc/php/7.0/apache2/conf.d
COPY apache-evolinux-defaults.conf /etc/apache2/conf-available
COPY php-evolinux-defaults.ini /etc/php/7.0/apache2/conf.d
RUN a2enconf apache-evolinux-defaults
RUN a2enmod rewrite remoteip headers