Added support for envsubst in image/container name

Envsubst allows to use dynamic container name
We use image name env substitution with docker-compose and .env to select right image tag for local development
Within alpine, envsubst installed with gettext package.
This commit is contained in:
Sergey Shambir 2019-03-02 11:26:21 +03:00
parent 02a89f6dac
commit 71661b4971
2 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,7 @@
FROM library/docker:stable
ENV HOME_DIR=/opt/crontab
RUN apk add --no-cache --virtual .run-deps bash jq \
RUN apk add --no-cache --virtual .run-deps gettext bash jq \
&& mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects \
&& adduser -S docker -D

View File

@ -12,7 +12,7 @@ if [ "${LOG_FILE}" == "" ]; then
LOG_DIR=/var/log/crontab
LOG_FILE=${LOG_DIR}/jobs.log
mkdir -p ${LOG_DIR}
touch ${LOG_FILE}
touch ${LOG_FILE}
fi
CONFIG=${HOME_DIR}/config.json
@ -40,7 +40,7 @@ slugify() {
make_image_cmd() {
DOCKERARGS=$(echo ${1} | jq -r .dockerargs)
if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi
IMAGE=$(echo ${1} | jq -r .image)
IMAGE=$(echo ${1} | jq -r .image | envsubst)
TMP_COMMAND=$(echo ${1} | jq -r .command)
echo "docker run ${DOCKERARGS} ${IMAGE} ${TMP_COMMAND}"
}
@ -50,7 +50,7 @@ make_container_cmd() {
if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi
SCRIPT_NAME=$(echo ${1} | jq -r .name)
PROJECT=$(echo ${1} | jq -r .project)
CONTAINER=$(echo ${1} | jq -r .container)
CONTAINER=$(echo ${1} | jq -r .container | envsubst)
TMP_COMMAND=$(echo ${1} | jq -r .command)
if [ "${PROJECT}" != "null" ]; then