Merge pull request 'fix dockers' (#270 ) from master into release

Reviewed-on: #270
fix dockers
2024-12-03 13:32:44 +03:00 · 2024-12-03 13:32:24 +03:00
5 changed files with 10 additions and 5 deletions
--- a/docker/android-shstk/Dockerfile
+++ b/docker/android-shstk/Dockerfile
@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}android
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
--- a/docker/osx-shstk/Dockerfile
+++ b/docker/osx-shstk/Dockerfile
@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}osx
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
--- a/docker/pi-shstk/Dockerfile
+++ b/docker/pi-shstk/Dockerfile
@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}pi
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
--- a/docker/windows-shstk/Dockerfile
+++ b/docker/windows-shstk/Dockerfile
@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}windows
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
--- a/docker/windows32-shstk/Dockerfile
+++ b/docker/windows32-shstk/Dockerfile
@@ -1,5 +1,6 @@
 ARG DOCKER_PREFIX=wapmobil/
-FROM ${DOCKER_PREFIX}windows32
+ARG IMAGE_FROM
+FROM ${DOCKER_PREFIX}${IMAGE_FROM}

 ARG BRANCH=release
 ARG LIBS_BUILD_NUMBER=9999
Author	SHA1	Message	Date
Пелипенко Иван	147bf31acd	Merge pull request 'fix dockers' (#270 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head There was a failure building this commit Details Reviewed-on: #270	2024-12-03 13:32:44 +03:00
peri4	812fe73092	fix dockers	2024-12-03 13:32:24 +03:00