diff --git a/charts/stable/docker-compose/Chart.yaml b/charts/stable/docker-compose/Chart.yaml index e8f98074d3f..ea055a7818b 100644 --- a/charts/stable/docker-compose/Chart.yaml +++ b/charts/stable/docker-compose/Chart.yaml @@ -20,7 +20,7 @@ name: docker-compose sources: - https://github.com/truecharts/charts/tree/master/charts/stable/docker-compose type: application -version: 7.0.6 +version: 7.0.7 annotations: truecharts.org/catagories: | - docker diff --git a/charts/stable/docker-compose/questions.yaml b/charts/stable/docker-compose/questions.yaml index eeb3237240c..b3e2d3b7cc2 100644 --- a/charts/stable/docker-compose/questions.yaml +++ b/charts/stable/docker-compose/questions.yaml @@ -18,7 +18,7 @@ questions: attrs: - variable: COMPOSE_FILE label: Docker Compose File - description: Path on the host of the compose file you want to load. You MUST mount the storage yourself + description: Path of the compose file you want to load. You MUST mount the storage yourself schema: type: string default: "" diff --git a/charts/stable/docker-compose/values.yaml b/charts/stable/docker-compose/values.yaml index c45dd33007d..4f59f404dc4 100644 --- a/charts/stable/docker-compose/values.yaml +++ b/charts/stable/docker-compose/values.yaml @@ -21,26 +21,7 @@ service: ports: main: port: 2376 - type: HTTPS - -lifecycle: - postStart: - exec: - command: - - /bin/bash - - -c - - | - if [ "${COMPOSE_FILE}" ]; then - counter=0; - while ! docker info > /dev/null 2>&1 && [[ ${counter} -lt 10 ]]; do - echo "docker not running yet. Waiting..." >> /proc/1/fd/1; - sleep 5; - counter=$((counter+1)); - done - docker-compose -f "${COMPOSE_FILE}" up -d && echo "Loading COMPOSE_FILE at location ${COMPOSE_FILE}" >> /proc/1/fd/1; - else - echo "COMPOSE_FILE not set, not auto-loading compose-file" >> /proc/1/fd/1; - fi + type: https workload: main: @@ -60,7 +41,24 @@ workload: env: DOCKER_TLS_CERTDIR: /certs COMPOSE_FILE: "" - + lifecycle: + postStart: + type: exec + command: + - /bin/bash + - -c + - | + if [ "${COMPOSE_FILE}" ]; then + counter=0; + while ! docker info > /dev/null 2>&1 && [[ ${counter} -lt 10 ]]; do + echo "docker not running yet. Waiting..." >> /proc/1/fd/1; + sleep 5; + counter=$((counter+1)); + done + docker-compose -f "${COMPOSE_FILE}" up -d && echo "Loaded COMPOSE_FILE at location ${COMPOSE_FILE}" >> /proc/1/fd/1; + else + echo "COMPOSE_FILE not set, not auto-loading compose-file" >> /proc/1/fd/1; + fi type: StatefulSet replicas: 1 strategy: RollingUpdate