parra/radicale-docker
parra
/
radicale-docker
mirror of https://github.com/parrazam/radicale-docker.git
1
0
Fork 0
Code Releases Activity

Updated Dockerfile to support image versions

This commit is contained in:
Parra 2021-12-21 12:40:58 +01:00
parent 20dd93dfed
commit 382511f22a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -1,4 +1,5 @@
FROM tomsquest/docker-radicale:latest ARG VERSION=latest
FROM tomsquest/docker-radicale:$VERSION
RUN python3 -m pip install git+https://github.com/Unrud/RadicaleInfCloud RUN python3 -m pip install --upgrade https://github.com/Unrud/RadicaleInfCloud/archive/master.tar.gz
COPY config.js /usr/lib/python3.7/site-packages/radicale_infcloud/web/config.js COPY config.js /usr/lib/python3.7/site-packages/radicale_infcloud/web/config.js

6
Jenkinsfile vendored
View File

@ -35,7 +35,7 @@ pipeline {
axes { axes {
axis { axis {
name 'PLATFORM' name 'PLATFORM'
values 'linux/amd64', 'linux/386', 'linux/arm64', 'linux/arm/v7' values 'linux/amd64', 'linux/386', 'linux/arm64', 'linux/arm'
} }
} }
stages { stages {
@ -59,7 +59,7 @@ pipeline {
} }
echo "Building ${TARGET_IMAGE} image..." echo "Building ${TARGET_IMAGE} image..."
sh "docker pull ${SOURCE_IMAGE}" sh "docker pull ${SOURCE_IMAGE}"
sh "docker buildx build -t ${TARGET_IMAGE} --platform ${PLATFORM} ." sh "docker buildx build -t ${TARGET_IMAGE} --platform ${PLATFORM} --build-arg VERSION=${PLATFORM.tokenize('/')[1]} ."
} }
} }
} }
@ -100,7 +100,7 @@ pipeline {
VERSION = '.' + (env.BRANCH_NAME).tokenize('/')[1] VERSION = '.' + (env.BRANCH_NAME).tokenize('/')[1]
} }
IMAGES = '' IMAGES = ''
for (ARCH in ['linux/amd64', 'linux/386', 'linux/arm64', 'linux/arm/v7']) { for (ARCH in PLATFORM) {
IMAGES += ' -a ' + TARGET + ':' + ARCH.tokenize('/')[1] + VERSION IMAGES += ' -a ' + TARGET + ':' + ARCH.tokenize('/')[1] + VERSION
} }
} }