From c4ead44fde12e2a35925462134841355a621db07 Mon Sep 17 00:00:00 2001 From: peri4 Date: Fri, 15 Nov 2024 14:40:01 +0300 Subject: [PATCH] pass branch name to docker build --- Jenkinsfile | 3 +++ docker/android-shstk/Dockerfile | 3 ++- docker/astra1.7-shstk/Dockerfile | 3 ++- docker/astra1.8-shstk/Dockerfile | 3 ++- docker/linux_cross-shstk/Dockerfile | 3 ++- docker/linux_desktop-shstk/Dockerfile | 3 ++- docker/osx-shstk/Dockerfile | 3 ++- docker/pi-shstk/Dockerfile | 3 ++- docker/windows-shstk/Dockerfile | 3 ++- docker/windows32-shstk/Dockerfile | 3 ++- 10 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d355b36..69d867d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,9 @@ def build_docker(dist, release_dir, is_testing) { if (env.DOCKER_PREFIX) { args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" } + if (env.BRANCH_NAME) { + args += " --build-arg BRANCH=${env.BRANCH_NAME}" + } args += " --build-arg IMAGE_FROM=${dist.docker_image}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" diff --git a/docker/android-shstk/Dockerfile b/docker/android-shstk/Dockerfile index cb535f7..5da7a53 100644 --- a/docker/android-shstk/Dockerfile +++ b/docker/android-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}android ARG LIBS_BUILD_NUMBER=9999 @@ -10,7 +11,7 @@ ENV ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake ENV NDK_PLATFORM="android-21" WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/astra1.7-shstk/Dockerfile b/docker/astra1.7-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/astra1.7-shstk/Dockerfile +++ b/docker/astra1.7-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/astra1.8-shstk/Dockerfile b/docker/astra1.8-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/astra1.8-shstk/Dockerfile +++ b/docker/astra1.8-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_cross-shstk/Dockerfile b/docker/linux_cross-shstk/Dockerfile index cc83f19..0a0888e 100644 --- a/docker/linux_cross-shstk/Dockerfile +++ b/docker/linux_cross-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/linux_desktop-shstk/Dockerfile b/docker/linux_desktop-shstk/Dockerfile index b214846..fabcc20 100644 --- a/docker/linux_desktop-shstk/Dockerfile +++ b/docker/linux_desktop-shstk/Dockerfile @@ -1,5 +1,6 @@ ARG DOCKER_PREFIX=wapmobil/ ARG IMAGE_FROM +ARG BRANCH=release FROM ${DOCKER_PREFIX}${IMAGE_FROM} ARG LIBS_BUILD_NUMBER=9999 @@ -8,7 +9,7 @@ ARG support_gl=1 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_linux RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/osx-shstk/Dockerfile b/docker/osx-shstk/Dockerfile index 4e67335..ed3cb66 100644 --- a/docker/osx-shstk/Dockerfile +++ b/docker/osx-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}osx ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/pi-shstk/Dockerfile b/docker/pi-shstk/Dockerfile index 363b367..d03ce70 100644 --- a/docker/pi-shstk/Dockerfile +++ b/docker/pi-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}pi ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows-shstk/Dockerfile b/docker/windows-shstk/Dockerfile index e11e48f..a513296 100644 --- a/docker/windows-shstk/Dockerfile +++ b/docker/windows-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}windows ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ diff --git a/docker/windows32-shstk/Dockerfile b/docker/windows32-shstk/Dockerfile index d454355..c1e07fb 100644 --- a/docker/windows32-shstk/Dockerfile +++ b/docker/windows32-shstk/Dockerfile @@ -1,4 +1,5 @@ ARG DOCKER_PREFIX=wapmobil/ +ARG BRANCH=release FROM ${DOCKER_PREFIX}windows32 ARG LIBS_BUILD_NUMBER=9999 @@ -6,7 +7,7 @@ ARG JOBS_COUNT=4 ENV PATH=/opt/cmake/bin:$PATH WORKDIR /soft -RUN git clone -b release --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git +RUN git clone -b ${BRANCH} --single-branch --depth 1 --recursive https://git.shstk.ru/SHS/shstk.git WORKDIR /soft/shstk_build_host RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \