SHS/shstk
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pass branch name to docker build

Browse Source
This commit is contained in:
Пелипенко Иван
2024-11-15 14:40:01 +03:00
parent 100421bed6
commit c4ead44fde
10 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Jenkinsfile vendored
View File

@@ -13,6 +13,9 @@ def build_docker(dist, release_dir, is_testing) {
if (env.DOCKER_PREFIX) { if (env.DOCKER_PREFIX) {
args += " --build-arg DOCKER_PREFIX=${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 IMAGE_FROM=${dist.docker_image}"
args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}" args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}"
args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}" args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}"

3
docker/android-shstk/Dockerfile
View File

@@ -1,4 +1,5 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}android FROM ${DOCKER_PREFIX}android
ARG LIBS_BUILD_NUMBER=9999 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" ENV NDK_PLATFORM="android-21"
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/astra1.7-shstk/Dockerfile
View File

@@ -1,5 +1,6 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG IMAGE_FROM ARG IMAGE_FROM
ARG BRANCH=release
FROM ${DOCKER_PREFIX}${IMAGE_FROM} FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
@@ -8,7 +9,7 @@ ARG support_gl=1
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 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 \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/astra1.8-shstk/Dockerfile
View File

@@ -1,5 +1,6 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG IMAGE_FROM ARG IMAGE_FROM
ARG BRANCH=release
FROM ${DOCKER_PREFIX}${IMAGE_FROM} FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
@@ -8,7 +9,7 @@ ARG support_gl=1
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 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 \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/linux_cross-shstk/Dockerfile
View File

@@ -1,5 +1,6 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG IMAGE_FROM ARG IMAGE_FROM
ARG BRANCH=release
FROM ${DOCKER_PREFIX}${IMAGE_FROM} FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
@@ -8,7 +9,7 @@ ARG support_gl=1
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/linux_desktop-shstk/Dockerfile
View File

@@ -1,5 +1,6 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG IMAGE_FROM ARG IMAGE_FROM
ARG BRANCH=release
FROM ${DOCKER_PREFIX}${IMAGE_FROM} FROM ${DOCKER_PREFIX}${IMAGE_FROM}
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
@@ -8,7 +9,7 @@ ARG support_gl=1
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 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 \ RUN cmake -G Ninja -DICU=0 -DLOCAL=0 -DQGLENGINE=${support_gl} -DQGLVIEW=${support_gl} -DHAS_GL=${support_gl} -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/osx-shstk/Dockerfile
View File

@@ -1,4 +1,5 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}osx FROM ${DOCKER_PREFIX}osx
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
@@ -6,7 +7,7 @@ ARG JOBS_COUNT=4
ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH ENV PATH=/soft/osxcross/target/bin:/opt/cmake/bin:$PATH
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/pi-shstk/Dockerfile
View File

@@ -1,4 +1,5 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}pi FROM ${DOCKER_PREFIX}pi
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
@@ -6,7 +7,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/windows-shstk/Dockerfile
View File

@@ -1,4 +1,5 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}windows FROM ${DOCKER_PREFIX}windows
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
@@ -6,7 +7,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \

3
docker/windows32-shstk/Dockerfile
View File

@@ -1,4 +1,5 @@
ARG DOCKER_PREFIX=wapmobil/ ARG DOCKER_PREFIX=wapmobil/
ARG BRANCH=release
FROM ${DOCKER_PREFIX}windows32 FROM ${DOCKER_PREFIX}windows32
ARG LIBS_BUILD_NUMBER=9999 ARG LIBS_BUILD_NUMBER=9999
@@ -6,7 +7,7 @@ ARG JOBS_COUNT=4
ENV PATH=/opt/cmake/bin:$PATH ENV PATH=/opt/cmake/bin:$PATH
WORKDIR /soft 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 WORKDIR /soft/shstk_build_host
RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \ RUN cmake -G Ninja -DICU=0 -DCROSSTOOLS=1 -DBUILD_NUMBER=${LIBS_BUILD_NUMBER} ../shstk \