Skip to content

Commit 4d92ab7

Browse files
committed
allow recipe redirect via ARG VSI_RECIPE_REPO
1 parent d280a4b commit 4d92ab7

File tree

5 files changed

+32
-19
lines changed

5 files changed

+32
-19
lines changed

docker/vsi_common/bashcov.Dockerfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
FROM vsiri/recipe:gosu AS gosu
2-
FROM vsiri/recipe:tini AS tini
3-
FROM vsiri/recipe:jq AS jq
4-
FROM vsiri/recipe:vsi AS vsi
5-
FROM vsiri/recipe:docker AS docker
1+
ARG VSI_RECIPE_REPO="vsiri/recipe"
2+
3+
FROM ${VSI_RECIPE_REPO}:gosu AS gosu
4+
FROM ${VSI_RECIPE_REPO}:tini AS tini
5+
FROM ${VSI_RECIPE_REPO}:jq AS jq
6+
FROM ${VSI_RECIPE_REPO}:vsi AS vsi
7+
FROM ${VSI_RECIPE_REPO}:docker AS docker
68
FROM docker/compose:alpine-1.25.4 AS docker-compose
79

810
FROM ruby:2.6.5-buster

docker/vsi_common/docker-compose.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ services:
1818
PYTHON_VERSION: ${SPHINX_PYTHON_VERSION-}
1919
PIPENV_VERSION: ${SPHINX_PIPENV_VERSION-}
2020
VIRTUALENV_VERSION: ${SPHINX_VIRTUALENV_VERSION-}
21+
VSI_RECIPE_REPO: ${SPHINX_RECIPE_REPO-"vsiri/recipe"}
2122
image: ${SPHINX_COMPILE_IMAGE-vsiri/sphinxdocs:compile}
2223
environment: &plugin_environment
2324
DOCKER_UID: ${UID_CONTAINER-1000}
@@ -40,6 +41,8 @@ services:
4041
build:
4142
context: .
4243
dockerfile: bashcov.Dockerfile
44+
args:
45+
VSI_RECIPE_REPO: ${BASHCOV_RECIPE_REPO-"vsiri/recipe"}
4346
image: ${BASHCOV_IMAGE-vsiri/bashcov:latest}
4447
environment:
4548
<<: *plugin_environment
@@ -55,7 +58,8 @@ services:
5558
context: .
5659
dockerfile: makeself.Dockerfile
5760
args:
58-
- MAKESELF_VERSION=${MAKESELF_VERSION-release-2.4.3}
61+
MAKESELF_VERSION: ${MAKESELF_VERSION-release-2.4.3}
62+
VSI_RECIPE_REPO: ${MAKESELF_RECIPE_REPO-"vsiri/recipe"}
5963
image: ${MAKESELF_IMAGE-vsiri/makeself:latest}
6064
environment:
6165
<<: *plugin_environment
@@ -75,8 +79,9 @@ services:
7579
# context: .
7680
# dockerfile: pyinstaller.Dockerfile
7781
# args:
78-
# - PYTHON_VERSION=${PYINSTALLER_PYTHON_VERSION-3.7.7}
79-
# - PYINSTALLER_VERSION=${PYINSTALLER_VERSION-3.6}
82+
# PYTHON_VERSION: ${PYINSTALLER_PYTHON_VERSION-3.7.7}
83+
# PYINSTALLER_VERSION: ${PYINSTALLER_VERSION-3.6}
84+
# VSI_RECIPE_REPO: ${PYINSTALLER_RECIPE_REPO-"vsiri/recipe"}
8085
# image: ${PYINSTALLER_IMAGE-vsiri/pyinstaller:3.7.7-3.6}
8186
# environment:
8287
# <<: *plugin_environment

docker/vsi_common/makeself.Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
FROM vsiri/recipe:tini-musl AS tini
2-
FROM vsiri/recipe:gosu AS gosu
3-
FROM vsiri/recipe:vsi AS vsi
1+
ARG VSI_RECIPE_REPO="vsiri/recipe"
2+
3+
FROM ${VSI_RECIPE_REPO}:tini-musl AS tini
4+
FROM ${VSI_RECIPE_REPO}:gosu AS gosu
5+
FROM ${VSI_RECIPE_REPO}:vsi AS vsi
46

57
FROM alpine:3.13
68

docker/vsi_common/pyinstaller.Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
FROM vsiri/recipe:gosu AS gosu
2-
FROM vsiri/recipe:tini AS tini
3-
FROM vsiri/recipe:pipenv AS pipenv
4-
FROM vsiri/recipe:vsi AS vsi
1+
ARG VSI_RECIPE_REPO="vsiri/recipe"
2+
3+
FROM ${VSI_RECIPE_REPO}:gosu AS gosu
4+
FROM ${VSI_RECIPE_REPO}:tini AS tini
5+
FROM ${VSI_RECIPE_REPO}:pipenv AS pipenv
6+
FROM ${VSI_RECIPE_REPO}:vsi AS vsi
57

68
FROM centos:6
79

docker/vsi_common/sphinx.Dockerfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
FROM vsiri/recipe:gosu AS gosu
2-
FROM vsiri/recipe:tini AS tini
3-
FROM vsiri/recipe:pipenv AS pipenv
4-
FROM vsiri/recipe:vsi AS vsi
1+
ARG VSI_RECIPE_REPO="vsiri/recipe"
2+
3+
FROM ${VSI_RECIPE_REPO}:gosu AS gosu
4+
FROM ${VSI_RECIPE_REPO}:tini AS tini
5+
FROM ${VSI_RECIPE_REPO}:pipenv AS pipenv
6+
FROM ${VSI_RECIPE_REPO}:vsi AS vsi
57

68
FROM python:3.10.11
79

0 commit comments

Comments
 (0)