docker ARG

docker/vsi_common/bashcov.Dockerfile

@@ -1,8 +1,10 @@
-FROM vsiri/recipe:gosu AS gosu
-FROM vsiri/recipe:tini AS tini
-FROM vsiri/recipe:jq AS jq
-FROM vsiri/recipe:vsi AS vsi
-FROM vsiri/recipe:docker AS docker
+ARG VSI_RECIPE_REPO="vsiri/recipe"
+
+FROM ${VSI_RECIPE_REPO}:gosu AS gosu
+FROM ${VSI_RECIPE_REPO}:tini AS tini
+FROM ${VSI_RECIPE_REPO}:jq AS jq
+FROM ${VSI_RECIPE_REPO}:vsi AS vsi
+FROM ${VSI_RECIPE_REPO}:docker AS docker
 FROM docker/compose:alpine-1.25.4 AS docker-compose
 
 FROM ruby:2.6.5-buster

docker/vsi_common/docker-compose.yml

@@ -15,9 +15,12 @@ services:
       context: .
       dockerfile: sphinx.Dockerfile
       args:
+        GOSU_SKIP_GPG: ${SPHINX_SKIP_GPG-${GOSU_SKIP_GPG-0}}
         PYTHON_VERSION: ${SPHINX_PYTHON_VERSION-}
         PIPENV_VERSION: ${SPHINX_PIPENV_VERSION-}
+        TINI_SKIP_GPG: ${SPHINX_SKIP_GPG-${TINI_SKIP_GPG-0}}
         VIRTUALENV_VERSION: ${SPHINX_VIRTUALENV_VERSION-}
+        VSI_RECIPE_REPO: ${SPHINX_RECIPE_REPO-${VSI_RECIPE_REPO-vsiri/recipe}}
     image: ${SPHINX_COMPILE_IMAGE-vsiri/sphinxdocs:compile}
     environment: &plugin_environment
       DOCKER_UID: ${UID_CONTAINER-1000}
@@ -40,6 +43,10 @@ services:
     build:
       context: .
       dockerfile: bashcov.Dockerfile
+      args:
+        GOSU_SKIP_GPG: ${BASHCOV_SKIP_GPG-${GOSU_SKIP_GPG-0}}
+        TINI_SKIP_GPG: ${BASHCOV_SKIP_GPG-${TINI_SKIP_GPG-0}}
+        VSI_RECIPE_REPO: ${BASHCOV_RECIPE_REPO-${VSI_RECIPE_REPO-vsiri/recipe}}
     image: ${BASHCOV_IMAGE-vsiri/bashcov:latest}
     environment:
       <<: *plugin_environment
@@ -55,7 +62,10 @@ services:
       context: .
       dockerfile: makeself.Dockerfile
       args:
-        - MAKESELF_VERSION=${MAKESELF_VERSION-release-2.4.3}
+        GOSU_SKIP_GPG: ${MAKESELF_SKIP_GPG-${GOSU_SKIP_GPG-0}}
+        MAKESELF_VERSION: ${MAKESELF_VERSION-release-2.4.3}
+        TINI_SKIP_GPG: ${MAKESELF_SKIP_GPG-${TINI_SKIP_GPG-0}}
+        VSI_RECIPE_REPO: ${MAKESELF_RECIPE_REPO-${VSI_RECIPE_REPO-vsiri/recipe}}
     image: ${MAKESELF_IMAGE-vsiri/makeself:latest}
     environment:
       <<: *plugin_environment
@@ -75,8 +85,11 @@ services:
   #     context: .
   #     dockerfile: pyinstaller.Dockerfile
   #     args:
-  #       - PYTHON_VERSION=${PYINSTALLER_PYTHON_VERSION-3.7.7}
-  #       - PYINSTALLER_VERSION=${PYINSTALLER_VERSION-3.6}
+  #       GOSU_SKIP_GPG: ${PYINSTALLER_SKIP_GPG-${GOSU_SKIP_GPG-0}}
+  #       PYTHON_VERSION: ${PYINSTALLER_PYTHON_VERSION-3.7.7}
+  #       PYINSTALLER_VERSION: ${PYINSTALLER_VERSION-3.6}
+  #       TINI_SKIP_GPG: ${PYINSTALLER_SKIP_GPG-${TINI_SKIP_GPG-0}}
+  #       VSI_RECIPE_REPO: ${PYINSTALLER_RECIPE_REPO-${VSI_RECIPE_REPO-vsiri/recipe}}
   #   image: ${PYINSTALLER_IMAGE-vsiri/pyinstaller:3.7.7-3.6}
   #   environment:
   #     <<: *plugin_environment

docker/vsi_common/makeself.Dockerfile

@@ -1,6 +1,8 @@
-FROM vsiri/recipe:tini-musl AS tini
-FROM vsiri/recipe:gosu AS gosu
-FROM vsiri/recipe:vsi AS vsi
+ARG VSI_RECIPE_REPO="vsiri/recipe"
+
+FROM ${VSI_RECIPE_REPO}:tini-musl AS tini
+FROM ${VSI_RECIPE_REPO}:gosu AS gosu
+FROM ${VSI_RECIPE_REPO}:vsi AS vsi
 
 FROM alpine:3.13
 

docker/vsi_common/pyinstaller.Dockerfile

@@ -1,7 +1,9 @@
-FROM vsiri/recipe:gosu AS gosu
-FROM vsiri/recipe:tini AS tini
-FROM vsiri/recipe:pipenv AS pipenv
-FROM vsiri/recipe:vsi AS vsi
+ARG VSI_RECIPE_REPO="vsiri/recipe"
+
+FROM ${VSI_RECIPE_REPO}:gosu AS gosu
+FROM ${VSI_RECIPE_REPO}:tini AS tini
+FROM ${VSI_RECIPE_REPO}:pipenv AS pipenv
+FROM ${VSI_RECIPE_REPO}:vsi AS vsi
 
 FROM centos:6
 

docker/vsi_common/sphinx.Dockerfile

@@ -1,7 +1,9 @@
-FROM vsiri/recipe:gosu AS gosu
-FROM vsiri/recipe:tini AS tini
-FROM vsiri/recipe:pipenv AS pipenv
-FROM vsiri/recipe:vsi AS vsi
+ARG VSI_RECIPE_REPO="vsiri/recipe"
+
+FROM ${VSI_RECIPE_REPO}:gosu AS gosu
+FROM ${VSI_RECIPE_REPO}:tini AS tini
+FROM ${VSI_RECIPE_REPO}:pipenv AS pipenv
+FROM ${VSI_RECIPE_REPO}:vsi AS vsi
 
 FROM python:3.10.11