Compare commits

...

2 Commits

Author SHA1 Message Date
99d3f98185
release test
All checks were successful
mapguesser/pipeline/pr-develop This commit looks good
2023-09-26 16:53:44 +02:00
a8879f4326
build docker image for multi arch
Some checks failed
mapguesser/pipeline/pr-develop There was a failure building this commit
2023-09-26 01:36:58 +02:00
3 changed files with 32 additions and 15 deletions

43
Jenkinsfile vendored
View File

@ -62,23 +62,42 @@ pipeline {
} }
} }
stage('Release Docker image') { stage('Prepare Docker release') {
environment {
COMPOSER_HOME="${WORKSPACE}/.composer"
npm_config_cache="${WORKSPACE}/.npm"
}
agent {
dockerfile {
filename 'docker/Dockerfile'
dir '.'
additionalBuildArgs '--target mapg_base'
reuseNode true
}
}
steps { steps {
script { script {
sh script: 'git clean -ffdx', label: 'Clean repository' sh script: 'git clean -ffdx', label: 'Clean repository'
env.VERSION = sh(script: 'git describe --tags --always --match "Release_*" HEAD', returnStdout: true).trim()
sh script: 'docker/scripts/release.sh', label: 'Release script'
sh script: "rm -rf ${env.COMPOSER_HOME} ${env.npm_config_cache}"
}
}
}
def version = sh(script: 'git describe --tags --always --match "Release_*" HEAD', returnStdout: true).trim() stage('Release Docker image') {
def imageUrl = "git.esoko.eu/esoko/mapguesser:${version}" steps {
script {
sh script: """docker buildx build \
-t ${imageUrl} \
-f docker/Dockerfile \
--target mapg_release \
.""",
label: 'Build Docker image'
withDockerRegistry([credentialsId: 'gitea-system-user', url: 'https://git.esoko.eu/']) { withDockerRegistry([credentialsId: 'gitea-system-user', url: 'https://git.esoko.eu/']) {
sh script: "docker push ${imageUrl}", label: 'Push Docker image to registry' sh script: 'docker buildx create --use --bootstrap --platform=linux/arm64,linux/amd64 --name multi-platform-builder'
sh script: """docker buildx build \
--platform linux/amd64,linux/arm64 \
-f docker/Dockerfile \
--target mapg_release \
-t git.esoko.eu/esoko/mapguesser:${env.VERSION} \
--push \
.""",
label: 'Build Docker image'
} }
} }
} }

View File

@ -36,7 +36,7 @@ RUN apt update --fix-missing && apt install -y cron
WORKDIR /var/www/mapguesser WORKDIR /var/www/mapguesser
COPY ./ /var/www/mapguesser COPY ./ /var/www/mapguesser
RUN docker/scripts/release.sh &&\ RUN chmod 777 /var/www/mapguesser/cache &&\
rm -rf /var/www/mapguesser/.git /var/www/mapguesser/.env rm -rf /var/www/mapguesser/.git /var/www/mapguesser/.env
EXPOSE 80 EXPOSE 80

View File

@ -2,8 +2,6 @@
set -e set -e
chmod 777 cache
echo "Installing Composer packages..." echo "Installing Composer packages..."
composer create-project --no-dev composer create-project --no-dev