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

Compare commits

merge into: evolix:master
Branches Tags
evolix:master
evolix:new-orga
...
pull from: evolix:new-orga
Branches Tags
evolix:new-orga
evolix:master

10 commits
master ... new-orga

Author SHA1 Message Date
David Prevot 3903531ba7 Provide gbp for Bookworm
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-29 17:59:32 +02:00
David Prevot fc5a044996 gbp: Use same layout as apach2-php
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-29 17:56:05 +02:00
David Prevot e06d7e0c04 Handle parallel build for gbp
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-29 17:44:59 +02:00
Ludovic Poujol 68cb12a5a3
More parallelism
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-26 16:54:59 +02:00
Ludovic Poujol ead308856f
Catch errors
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-26 16:36:33 +02:00
Ludovic Poujol 3c88061401
Change way apache2-php for buster/stretch too
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-25 18:08:53 +02:00
Ludovic Poujol afa4b99a8a
Jenkins (temp) disable push to docker hub + change tag name on branch name
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-25 18:01:56 +02:00
Ludovic Poujol 94d76c581d
Try using parallel
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-25 17:06:38 +02:00
Ludovic Poujol 568c8d2186
Update gitea/jenkins id
All checks were successful
gitea/evodocker/pipeline/head This commit looks good
Details
2024-04-25 17:00:57 +02:00
Ludovic Poujol e612a5d921
Tring a new way to organize the dockerfiles
Some checks failed
gitea/evodocker/pipeline/head There was a failure building this commit
Details
2024-04-25 16:51:22 +02:00
9 changed files with 372 additions and 213 deletions
Show stats Expand all files Collapse all files

557
.Jenkinsfile
View file

@ -7,28 +7,82 @@ pipeline {
stages {
stage('Build gbp') {
steps {
script {
def deb = docker.build("evolix/gbp:build${env.BUILD_ID}", "gbp")
deb.inside {
sh 'gbp --version'
}
docker.withRegistry('', 'hub.docker') {
deb.push('latest')
parallel {
stage('Build gbp > Sid') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/gbp:build${env.BUILD_ID}", "gbp/sid")
deb.inside {
sh 'gbp --version'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('latest')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('latest')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("latest-branch_${env.BRANCH_NAME}")
}
}
}
}
}
}
}
}
stage('Build gbp (Bullseye)') {
steps {
script {
def deb = docker.build("evolix/gbp:build${env.BUILD_ID}", "-f gbp/Dockerfile.bullseye gbp")
deb.inside {
sh 'gbp --version'
stage('Build gbp > Bullseye') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/gbp:build${env.BUILD_ID}", "gbp/bullseye")
deb.inside {
sh 'gbp --version'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('bullseye')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('bullseye')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("bullseye-branch_${env.BRANCH_NAME}")
}
}
}
}
}
docker.withRegistry('', 'hub.docker') {
deb.push('bullseye')
}
stage('Build gbp > Bookworm') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/gbp:build${env.BUILD_ID}", "gbp/bookworm")
deb.inside {
sh 'gbp --version'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('bookworm')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('bookworm')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("bookworm-branch_${env.BRANCH_NAME}")
}
}
}
}
}
}
}
@ -41,9 +95,9 @@ pipeline {
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('latest')
}
// docker.withRegistry('', 'hub.docker') {
// deb.push('latest')
// }
}
}
}
@ -55,9 +109,9 @@ pipeline {
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('latest')
}
// docker.withRegistry('', 'hub.docker') {
// deb.push('latest')
// }
}
}
}
@ -69,9 +123,9 @@ pipeline {
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('latest')
}
// docker.withRegistry('', 'hub.docker') {
// deb.push('latest')
// }
}
}
}
@ -85,201 +139,296 @@ pipeline {
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('latest')
// docker.withRegistry('', 'hub.docker') {
// deb.push('latest')
// }
}
}
}
stage('Build apache2-php') {
parallel {
stage('Build apache2-php > Stretch') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/apache2-php:deb9build${env.BUILD_ID}", "apache2-php/stretch/")
deb.inside {
sh 'echo Test needed'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('stretch')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('stretch')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("stretch-branch_${env.BRANCH_NAME}")
}
}
}
}
}
}
stage('Build apache2-php > Buster') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/apache2-php:deb10build${env.BUILD_ID}", "apache2-php/buster/")
deb.inside {
sh 'echo Test needed'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('buster')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('buster')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("buster-branch_${env.BRANCH_NAME}")
}
}
}
}
}
}
stage('Build apache2-php > Bullseye') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/apache2-php:deb11build${env.BUILD_ID}", "./apache2-php/bullseye")
deb.inside {
sh 'echo Test needed'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('bullseye')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('bullseye')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("bullseye-branch_${env.BRANCH_NAME}")
}
}
}
}
}
}
stage('Build apache2-php > Bookworm') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/apache2-php:deb12build${env.BUILD_ID}", "./apache2-php/bookworm")
deb.inside {
sh 'echo Test needed'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('bookworm')
// deb.push('latest')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('bookworm')
deb.push('latest')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("bookworm-branch_${env.BRANCH_NAME}")
}
}
}
}
}
}
}
}
stage('Build apache2-php (Stretch)') {
steps {
script {
def deb = docker.build("evolix/redis:deb9build${env.BUILD_ID}", "-f apache2-php/stretch/Dockerfile .")
deb.inside {
sh 'echo Test needed'
stage('Build redis') {
parallel {
stage('Build redis > Stretch') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/redis:deb9build${env.BUILD_ID}", "redis/stretch")
deb.inside {
sh 'echo Test needed'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('strech')
// deb.push('latest')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('strech')
deb.push('latest')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("strech-branch_${env.BRANCH_NAME}")
}
}
}
}
}
docker.withRegistry('', 'hub.docker') {
deb.push('stretch')
}
stage('Build redis > Buster') {
steps {
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
script {
def deb = docker.build("evolix/redis:deb10build${env.BUILD_ID}", "redis/buster")
deb.inside {
sh 'echo Test needed'
}
if(env.BRANCH_NAME == "master") {
// docker.withRegistry('', 'hub.docker') {
// deb.push('buster')
// deb.push('latest')
// }
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push('buster')
deb.push('latest')
}
}
else {
docker.withRegistry('https://gitea.evolix.org/evolix', '8dfefa9b-64e5-4361-add4-6214b53be14a') {
deb.push("buster-branch_${env.BRANCH_NAME}")
}
}
}
}
}
}
}
}
stage('Build apache2-php (Buster)') {
steps {
script {
def deb = docker.build("evolix/apache2-php:deb10build${env.BUILD_ID}", "-f apache2-php/buster/Dockerfile .")
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('buster')
deb.push('latest')
}
}
}
}
stage('Build apache2-php (Bullseye)') {
steps {
script {
def deb = docker.build("evolix/apache2-php:deb11build${env.BUILD_ID}", "-f apache2-php/bullseye/Dockerfile .")
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('bullseye')
deb.push('latest')
}
}
}
}
stage('Build apache2-php (Bookworm)') {
steps {
script {
def deb = docker.build("evolix/apache2-php:deb12build${env.BUILD_ID}", "-f apache2-php/bookworm/Dockerfile .")
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('bookworm')
deb.push('latest')
}
}
}
}
stage('Build redis (Stretch)') {
steps {
script {
def deb = docker.build("evolix/redis:deb9build${env.BUILD_ID}", "redis/stretch")
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('stretch')
}
}
}
}
stage('Build redis (Buster)') {
steps {
script {
def deb = docker.build("evolix/redis:deb10build${env.BUILD_ID}", "redis/buster")
deb.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb.push('buster')
deb.push('latest')
}
}
}
}
stage('Build php') {
steps {
script {
def deb = docker.build("evolix/php:build${env.BUILD_ID}", "-f php/Dockerfile php")
deb.inside {
sh 'composer --version'
parallel {
stage('Build php') {
steps {
script {
def deb = docker.build("evolix/php:build${env.BUILD_ID}", "-f php/Dockerfile php")
deb.inside {
sh 'composer --version'
}
// docker.withRegistry('', 'hub.docker') {
// deb.push('latest')
// }
}
}
docker.withRegistry('', 'hub.docker') {
deb.push('latest')
}
stage('Build php (Jessie)') {
steps {
script {
def deb8 = docker.build("evolix/php:deb8build${env.BUILD_ID}", "-f php/Dockerfile.jessie php")
deb8.inside {
sh 'echo Test needed'
}
// docker.withRegistry('', 'hub.docker') {
// deb8.push('jessie')
// deb8.push('5.6')
// }
}
}
}
stage('Build php (Stretch)') {
steps {
script {
def deb9 = docker.build("evolix/php:deb9build${env.BUILD_ID}", "-f php/Dockerfile.stretch php")
deb9.inside {
sh 'composer --version'
}
// docker.withRegistry('', 'hub.docker') {
// deb9.push('stretch')
// deb9.push('7.0')
// }
}
}
}
stage('Build php (Buster)') {
steps {
script {
def deb10 = docker.build("evolix/php:deb10build${env.BUILD_ID}", "-f php/Dockerfile.buster php")
deb10.inside {
sh 'composer --version'
}
// docker.withRegistry('', 'hub.docker') {
// deb10.push('buster')
// deb10.push('7.3')
// }
}
}
}
stage('Build php (Bullseye)') {
steps {
script {
def deb11 = docker.build("evolix/php:deb11build${env.BUILD_ID}", "-f php/Dockerfile.bullseye php")
deb11.inside {
sh 'composer --version'
}
// docker.withRegistry('', 'hub.docker') {
// deb11.push('bullseye')
// deb11.push('7.4')
// }
}
}
}
stage('Build php (Bullseye PHP 8.0)') {
steps {
script {
def deb11php80 = docker.build("evolix/php:deb11php80build${env.BUILD_ID}", "-f php/Dockerfile.bullseye80 php")
deb11php80.inside {
sh 'composer --version'
}
// docker.withRegistry('', 'hub.docker') {
// deb11php80.push('bullseye80')
// deb11php80.push('8.0')
// }
}
}
}
stage('Build php (Bullseye PHP 8.1)') {
steps {
script {
def deb11php81 = docker.build("evolix/php:deb11php81build${env.BUILD_ID}", "-f php/Dockerfile.bullseye81 php")
deb11php81.inside {
sh 'composer --version'
}
// docker.withRegistry('', 'hub.docker') {
// deb11php81.push('bullseye81')
// deb11php81.push('8.1')
// }
}
}
}
}
}
stage('Build php (Jessie)') {
steps {
script {
def deb8 = docker.build("evolix/php:deb8build${env.BUILD_ID}", "-f php/Dockerfile.jessie php")
deb8.inside {
sh 'echo Test needed'
}
docker.withRegistry('', 'hub.docker') {
deb8.push('jessie')
deb8.push('5.6')
}
}
}
}
stage('Build php (Stretch)') {
steps {
script {
def deb9 = docker.build("evolix/php:deb9build${env.BUILD_ID}", "-f php/Dockerfile.stretch php")
deb9.inside {
sh 'composer --version'
}
docker.withRegistry('', 'hub.docker') {
deb9.push('stretch')
deb9.push('7.0')
}
}
}
}
stage('Build php (Buster)') {
steps {
script {
def deb10 = docker.build("evolix/php:deb10build${env.BUILD_ID}", "-f php/Dockerfile.buster php")
deb10.inside {
sh 'composer --version'
}
docker.withRegistry('', 'hub.docker') {
deb10.push('buster')
deb10.push('7.3')
}
}
}
}
stage('Build php (Bullseye)') {
steps {
script {
def deb11 = docker.build("evolix/php:deb11build${env.BUILD_ID}", "-f php/Dockerfile.bullseye php")
deb11.inside {
sh 'composer --version'
}
docker.withRegistry('', 'hub.docker') {
deb11.push('bullseye')
deb11.push('7.4')
}
}
}
}
stage('Build php (Bullseye PHP 8.0)') {
steps {
script {
def deb11php80 = docker.build("evolix/php:deb11php80build${env.BUILD_ID}", "-f php/Dockerfile.bullseye80 php")
deb11php80.inside {
sh 'composer --version'
}
docker.withRegistry('', 'hub.docker') {
deb11php80.push('bullseye80')
deb11php80.push('8.0')
}
}
}
}
stage('Build php (Bullseye PHP 8.1)') {
steps {
script {
def deb11php81 = docker.build("evolix/php:deb11php81build${env.BUILD_ID}", "-f php/Dockerfile.bullseye81 php")
deb11php81.inside {
sh 'composer --version'
}
docker.withRegistry('', 'hub.docker') {
deb11php81.push('bullseye81')
deb11php81.push('8.1')
}
}
}
}
}
}

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

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

1
gbp/Dockerfile
View file

@ -1 +0,0 @@
Dockerfile.sid

11
gbp/bookworm/Dockerfile Normal file
View file

@ -0,0 +1,11 @@
FROM debian:bookworm-slim
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
build-essential \
debhelper \
dh-exec \
git-buildpackage \
equivs \
devscripts \
&& rm -rf /var/lib/apt/lists/*

0
gbp/Dockerfile.bullseye → gbp/bullseye/Dockerfile
View file

0
gbp/Dockerfile.sid → gbp/sid/Dockerfile
View file