Compare commits

..

No commits in common. "105cc96963de3009c74f9ffcdc346b7eb8802d2c" and "390c13608a32675cbb6430125eda21e99387c18c" have entirely different histories.

2 changed files with 6 additions and 26 deletions

29
Jenkinsfile vendored
View File

@ -62,36 +62,15 @@ pipeline {
} }
} }
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 {
script {
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}"
}
}
}
stage('Release Docker image') { stage('Release Docker image') {
steps { steps {
script { script {
sh script: 'git clean -ffdx', label: 'Clean repository'
env.VERSION = sh(script: 'git describe --tags --always --match "Release_*" HEAD', returnStdout: true).trim()
withDockerRegistry([credentialsId: 'gitea-system-user', url: 'https://git.esoko.eu/']) { withDockerRegistry([credentialsId: 'gitea-system-user', url: 'https://git.esoko.eu/']) {
sh script: 'docker buildx create --use --bootstrap --platform=linux/arm64,linux/amd64 --name multi-platform-builder'
sh script: """docker buildx build \ sh script: """docker buildx build \
--platform linux/amd64,linux/arm64 \
-f docker/Dockerfile \ -f docker/Dockerfile \
--target mapg_release \ --target mapg_release \
-t git.esoko.eu/esoko/mapguesser:${env.VERSION} \ -t git.esoko.eu/esoko/mapguesser:${env.VERSION} \

View File

@ -37,7 +37,8 @@ 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 rm -rf /var/www/mapguesser/.git RUN docker/scripts/release.sh &&\
rm -rf /var/www/mapguesser/.git
EXPOSE 80 EXPOSE 80
EXPOSE 8090 EXPOSE 8090