diff --git a/Containerfile.fpm b/Containerfile.fpm index 8116b0d..86f7f5e 100644 --- a/Containerfile.fpm +++ b/Containerfile.fpm @@ -67,6 +67,6 @@ RUN set -xe;\ mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" WORKDIR /var/www VOLUME /var/www/storage /var/www/bootstrap /public -ENTRYPOINT /entrypoint.sh +ENTRYPOINT /entrypoint.fpm.sh LABEL build.date=$DATE version.pixelfev=$VERSION diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index eeb0929..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,95 +0,0 @@ -version = "" -project = "pixelfed" -repo = "zknt" -registry = "reg.zknt.org" -timeStamp = Calendar.getInstance().getTime().format('YYYY-MM-dd',TimeZone.getTimeZone('UTC')) - -pipeline { - agent any - environment { - ZKNT_CRED = credentials("6ff44976-23cd-4cc2-902c-de8c340e65e5") - IO_CRED = credentials("3deeee3d-6fce-4430-98dd-9b4db56f43f7") - QUAY_CRED = credentials("18fb6f7e-c6bc-4d06-9bf9-08c2af6bfc1a") - } - stages { - stage('Build image') { - steps { - script { - sh "buildah login -u " + ZKNT_CRED_USR + " -p " + ZKNT_CRED_PSW + " reg.zknt.org" - def image = registry + '/' + repo + '/' + project - sh "buildah bud -f Containerfile --build-arg DATE=$timeStamp -t pixelfed:dev" - sh "buildah bud -f Containerfile.fpm --build-arg DATE=$timeStamp -t pixelfed:dev-fpm" - sh "buildah tag pixelfed:dev reg.zknt.org/zknt/pixelfed:dev" - sh "buildah tag pixelfed:dev reg.zknt.org/zknt/pixelfed:latest" - sh "buildah tag pixelfed:dev-fpm reg.zknt.org/zknt/pixelfed:dev-fpm" - sh "buildah tag pixelfed:dev-fpm reg.zknt.org/zknt/pixelfed:fpm" - sh "buildah push reg.zknt.org/zknt/pixelfed:dev" - sh "buildah push reg.zknt.org/zknt/pixelfed:latest" - sh "buildah push reg.zknt.org/zknt/pixelfed:dev-fpm" - sh "buildah push reg.zknt.org/zknt/pixelfed:fpm" - } - script { - sh "buildah login -u " + IO_CRED_USR+ " -p " + IO_CRED_PSW + " docker.io" - sh "buildah tag pixelfed:dev docker.io/zknt/pixelfed:dev" - sh "buildah tag pixelfed:dev docker.io/zknt/pixelfed:latest" - sh "buildah tag pixelfed:dev docker.io/zknt/pixelfed:$timeStamp" - sh "buildah tag pixelfed:dev-fpm docker.io/zknt/pixelfed:dev-fpm" - sh "buildah tag pixelfed:dev-fpm docker.io/zknt/pixelfed:fpm" - sh "buildah tag pixelfed:dev-fpm docker.io/zknt/pixelfed:$timeStamp-fpm" - sh "buildah push docker.io/zknt/pixelfed:dev" - sh "buildah push docker.io/zknt/pixelfed:dev-fpm" - sh "buildah push docker.io/zknt/pixelfed:latest" - sh "buildah push docker.io/zknt/pixelfed:$timeStamp" - sh "buildah push docker.io/zknt/pixelfed:$timeStamp-fpm" - sh "buildah push docker.io/zknt/pixelfed:fpm" - } - script { - sh "buildah login -u " + QUAY_CRED_USR+ " -p " + QUAY_CRED_PSW + " quay.io" - sh "buildah tag pixelfed:dev quay.io/zknt/pixelfed:dev" - sh "buildah tag pixelfed:dev quay.io/zknt/pixelfed:latest" - sh "buildah tag pixelfed:dev quay.io/zknt/pixelfed:$timeStamp" - sh "buildah tag pixelfed:dev-fpm quay.io/zknt/pixelfed:dev-fpm" - sh "buildah tag pixelfed:dev-fpm quay.io/zknt/pixelfed:fpm" - sh "buildah tag pixelfed:dev-fpm quay.io/zknt/pixelfed:$timeStamp-fpm" - sh "buildah push quay.io/zknt/pixelfed:dev" - sh "buildah push quay.io/zknt/pixelfed:latest" - sh "buildah push quay.io/zknt/pixelfed:$timeStamp" - sh "buildah push quay.io/zknt/pixelfed:dev-fpm" - sh "buildah push quay.io/zknt/pixelfed:$timeStamp-fpm" - sh "buildah push quay.io/zknt/pixelfed:fpm" - } - } - } - } - - post { - always { - sh """buildah rmi -af""" - emailext body: 'build finished', subject: '[jenkins] docker '+project+'('+timeStamp+'-test): ' + currentBuild.result, to: 'cg@zknt.org', from: 'sysadm@zknt.org', attachLog: true - } - } - options { - buildDiscarder(BuildHistoryManager([ - [ - conditions: [ - BuildResult(matchFailure: true) - ], - matchAtMost: 4, - continueAfterMatch: false - ], - [ - conditions: [ - BuildResult(matchSuccess: true) - ], - matchAtMost: 4, - continueAfterMatch: false - ], - [ - conditions: [ - BuildResult(matchSuccess: true, matchFailure: true) - ], - actions: [DeleteBuild()] - ] - ])) - } -} diff --git a/build.yaml b/build.yaml deleted file mode 100644 index 17a3795..0000000 --- a/build.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -version: "" -project: pixelfed -trigger_upstream: ../debian-php-81/trunk -timestamp_version: true -additional_tags: - - latest