diff --git a/charts/stable/docker-compose/.helmignore b/charts/stable/docker/.helmignore similarity index 100% rename from charts/stable/docker-compose/.helmignore rename to charts/stable/docker/.helmignore diff --git a/charts/stable/docker-compose/CHANGELOG.md b/charts/stable/docker/CHANGELOG.md similarity index 100% rename from charts/stable/docker-compose/CHANGELOG.md rename to charts/stable/docker/CHANGELOG.md diff --git a/charts/stable/docker-compose/Chart.yaml b/charts/stable/docker/Chart.yaml similarity index 86% rename from charts/stable/docker-compose/Chart.yaml rename to charts/stable/docker/Chart.yaml index 5d976108912..aa3d3457e0d 100644 --- a/charts/stable/docker-compose/Chart.yaml +++ b/charts/stable/docker/Chart.yaml @@ -5,11 +5,10 @@ dependencies: repository: https://library-charts.truecharts.org version: 14.3.5 deprecated: false -description: Dedicated App for using Docker-Compose on TrueNAS SCALE +description: Dedicated App for using Docker-in-Docker home: https://truecharts.org/charts/stable/docker-compose icon: https://truecharts.org/img/hotlink-ok/chart-icons/docker-compose.png keywords: - - docker-compose - docker kubeVersion: ">=1.16.0-0" maintainers: @@ -20,7 +19,7 @@ name: docker-compose sources: - https://github.com/truecharts/charts/tree/master/charts/stable/docker-compose type: application -version: 7.0.25 +version: 1.0.0 annotations: truecharts.org/category: docker truecharts.org/SCALE-support: "true" diff --git a/charts/stable/docker-compose/README.md b/charts/stable/docker/README.md similarity index 100% rename from charts/stable/docker-compose/README.md rename to charts/stable/docker/README.md diff --git a/charts/stable/docker-compose/icon.png b/charts/stable/docker/icon.png similarity index 100% rename from charts/stable/docker-compose/icon.png rename to charts/stable/docker/icon.png diff --git a/charts/stable/docker-compose/questions.yaml b/charts/stable/docker/questions.yaml similarity index 63% rename from charts/stable/docker-compose/questions.yaml rename to charts/stable/docker/questions.yaml index b3e2d3b7cc2..8e0818ea579 100644 --- a/charts/stable/docker-compose/questions.yaml +++ b/charts/stable/docker/questions.yaml @@ -9,19 +9,7 @@ questions: # Include{podSpec} # Include{containerMain} - - variable: env - group: "App Configuration" - label: "Image Environment" - schema: - additional_attrs: true - type: dict - attrs: - - variable: COMPOSE_FILE - label: Docker Compose File - description: Path of the compose file you want to load. You MUST mount the storage yourself - schema: - type: string - default: "" + # Include{containerBasic} # Include{containerAdvanced} # Include{containerConfig} diff --git a/charts/stable/docker-compose/templates/NOTES.txt b/charts/stable/docker/templates/NOTES.txt similarity index 100% rename from charts/stable/docker-compose/templates/NOTES.txt rename to charts/stable/docker/templates/NOTES.txt diff --git a/charts/stable/docker-compose/templates/common.yaml b/charts/stable/docker/templates/common.yaml similarity index 100% rename from charts/stable/docker-compose/templates/common.yaml rename to charts/stable/docker/templates/common.yaml diff --git a/charts/stable/docker-compose/values.yaml b/charts/stable/docker/values.yaml similarity index 59% rename from charts/stable/docker-compose/values.yaml rename to charts/stable/docker/values.yaml index bc294d5df44..30ba55c41b1 100644 --- a/charts/stable/docker-compose/values.yaml +++ b/charts/stable/docker/values.yaml @@ -37,25 +37,6 @@ workload: type: tcp 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