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

Tring a new way to organize the dockerfiles
Some checks failed
gitea/evodocker/pipeline/head There was a failure building this commit
Details

Browse source
This commit is contained in:
Ludovic Poujol 2024-04-25 16:51:22 +02:00
parent 4ea3469f5d
commit e612a5d921
Signed by: lpoujol
SSH key fingerprint: SHA256:YZbQWfjHONnvIGkFZMs0xRKtqzqGqwtZU+kCOKhZXPA
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.Jenkinsfile
View file

@ -123,7 +123,7 @@ pipeline {
stage('Build apache2-php (Bullseye)') {
steps {
script {
def deb = docker.build("evolix/apache2-php:deb11build${env.BUILD_ID}", "-f apache2-php/bullseye/Dockerfile .")
def deb = docker.build("evolix/apache2-php:deb11build${env.BUILD_ID}", "./apache2-php/bullseye")
deb.inside {
sh 'echo Test needed'
}
@ -137,7 +137,7 @@ pipeline {
stage('Build apache2-php (Bookworm)') {
steps {
script {
def deb = docker.build("evolix/apache2-php:deb12build${env.BUILD_ID}", "-f apache2-php/bookworm/Dockerfile .")
def deb = docker.build("evolix/apache2-php:deb12build${env.BUILD_ID}", "./apache2-php/bookworm")
deb.inside {
sh 'echo Test needed'
}
@ -145,7 +145,13 @@ pipeline {
deb.push('bookworm')
deb.push('latest')
}
docker.withRegistry('https://gitea.evolix.org/evolix', '709e37a1-d02e-4c4d-90d6-3bcdf74096d2') {
deb.push('bookworm')
deb.push('latest')
}
}
}
}

4
apache2-php/bookworm/Dockerfile
View file

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

4
apache2-php/bullseye/Dockerfile
View file

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