Compare commits

...

3 Commits

Author SHA1 Message Date
e684365612
error reporting should always be E_ALL
All checks were successful
mapguesser/pipeline/pr-develop This commit looks good
2023-09-26 23:49:36 +02:00
105cc96963
Merge pull request 'build docker image for multi arch' (!78) from feature/multiarch-docker-image into develop
All checks were successful
mapguesser/pipeline/head This commit looks good
Reviewed-on: #78
2023-09-26 23:48:28 +02:00
bdd62aadf5
build docker image for multi arch
All checks were successful
mapguesser/pipeline/pr-develop This commit looks good
2023-09-26 22:20:49 +02:00
3 changed files with 25 additions and 6 deletions

25
Jenkinsfile vendored
View File

@ -62,15 +62,36 @@ 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() 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') {
steps {
script {
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,8 +37,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 rm -rf /var/www/mapguesser/.git
rm -rf /var/www/mapguesser/.git
EXPOSE 80 EXPOSE 80
EXPOSE 8090 EXPOSE 8090

View File

@ -16,9 +16,8 @@ use MapGuesser\Repository\UserRepository;
require 'main.php'; require 'main.php';
if (!empty($_ENV['DEV'])) {
error_reporting(E_ALL); error_reporting(E_ALL);
if (!empty($_ENV['DEV'])) {
ini_set('display_errors', '1'); ini_set('display_errors', '1');
} else { } else {
ini_set('display_errors', '0'); ini_set('display_errors', '0');