From 76675e99d5c1807dae4ef082d3db1758db4593d1 Mon Sep 17 00:00:00 2001 From: will Farrell Date: Fri, 7 Apr 2017 23:25:53 -0600 Subject: [PATCH] bug fix only first w/ onstart was triggered --- .gitignore | 1 + Dockerfile | 2 +- README.md | 2 +- docker-compose.yml | 2 +- docker-entrypoint | 5 ++++- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e952a18..beeb899 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.iml home_dir +config.json diff --git a/Dockerfile b/Dockerfile index b6cbef6..f6de2be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM library/docker:1.13 +FROM library/docker:stable ENV HOME_DIR=/opt/crontab RUN apk add --no-cache --virtual .run-deps bash jq \ diff --git a/README.md b/README.md index fd9ae8e..61039f9 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ See [`config.sample.json`](https://github.com/willfarrell/docker-crontab/blob/ma docer build -t crontab . docker run -d \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -v /usr/bin/docker:/usr/bin/docker:ro \ + -v ./env:/opt/env:ro \ -v /path/to/config/dir:/opt/crontab:rw \ crontab ``` diff --git a/docker-compose.yml b/docker-compose.yml index 9c3e550..223da1d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,4 +12,4 @@ services: volumes: - "/var/run/docker.sock:/var/run/docker.sock:ro" # - "/usr/bin/docker:/usr/bin/docker:ro" - - "/Users/willfarrell/Development/docker/crontab/home_dir:/opt/crontab:rw" + - "/Users/willfarrell/Development/docker/docker-crontab/home_dir:/opt/crontab:rw" diff --git a/docker-entrypoint b/docker-entrypoint index fdf41e5..1f7ce1e 100755 --- a/docker-entrypoint +++ b/docker-entrypoint @@ -12,6 +12,9 @@ CONFIG=${HOME_DIR}/config.json DOCKER_SOCK=/var/run/docker.sock CRONTAB_FILE=/etc/crontabs/docker +# Ensure dir exist - in case of volume mapping +mkdir -p ${HOME_DIR}/jobs ${HOME_DIR}/projects + make_image_cmd() { DOCKERARGS=$(echo ${1} | jq -r .dockerargs) if [ "${DOCKERARGS}" == "null" ]; then DOCKERARGS=; fi @@ -168,7 +171,7 @@ EOF cat ${CRONTAB_FILE} echo "##### run commands with onstart #####" - for COMMAND in "${ONSTART}"; do + for COMMAND in "${ONSTART[@]}"; do echo "${COMMAND}" ${COMMAND} & done