diff --git a/dev/docker-compose/0.0.2/CHANGELOG.md b/dev/docker-compose/0.0.3/CHANGELOG.md
similarity index 67%
rename from dev/docker-compose/0.0.2/CHANGELOG.md
rename to dev/docker-compose/0.0.3/CHANGELOG.md
index c3b428bade..5bfdc01dbd 100644
--- a/dev/docker-compose/0.0.2/CHANGELOG.md
+++ b/dev/docker-compose/0.0.3/CHANGELOG.md
@@ -1,6 +1,15 @@
# Changelog
+
+### [docker-compose-0.0.3](https://github.com/truecharts/apps/compare/docker-compose-0.0.2...docker-compose-0.0.3) (2022-02-24)
+
+#### Feat
+
+* Add autoloading for compose file ([#1958](https://github.com/truecharts/apps/issues/1958))
+
+
+
### [docker-compose-0.0.2](https://github.com/truecharts/apps/compare/docker-compose-0.0.1...docker-compose-0.0.2) (2022-02-24)
@@ -17,4 +26,3 @@
#### Feat
* add a dedicated App for using Docker-Compose ([#1954](https://github.com/truecharts/apps/issues/1954))
-
diff --git a/dev/docker-compose/0.0.2/CONFIG.md b/dev/docker-compose/0.0.3/CONFIG.md
similarity index 100%
rename from dev/docker-compose/0.0.2/CONFIG.md
rename to dev/docker-compose/0.0.3/CONFIG.md
diff --git a/dev/docker-compose/0.0.2/Chart.lock b/dev/docker-compose/0.0.3/Chart.lock
similarity index 78%
rename from dev/docker-compose/0.0.2/Chart.lock
rename to dev/docker-compose/0.0.3/Chart.lock
index 9786e27710..16350c04b4 100644
--- a/dev/docker-compose/0.0.2/Chart.lock
+++ b/dev/docker-compose/0.0.3/Chart.lock
@@ -3,4 +3,4 @@ dependencies:
repository: https://truecharts.org
version: 8.16.0
digest: sha256:fa603eaefc7f57029052919d45fd45424e58a69f707af7b657afd49a4b41a435
-generated: "2022-02-24T18:19:25.650140959Z"
+generated: "2022-02-24T19:54:59.370749353Z"
diff --git a/dev/docker-compose/0.0.2/Chart.yaml b/dev/docker-compose/0.0.3/Chart.yaml
similarity index 97%
rename from dev/docker-compose/0.0.2/Chart.yaml
rename to dev/docker-compose/0.0.3/Chart.yaml
index 64593704f8..e94825422d 100644
--- a/dev/docker-compose/0.0.2/Chart.yaml
+++ b/dev/docker-compose/0.0.3/Chart.yaml
@@ -20,7 +20,7 @@ name: docker-compose
sources:
- https://github.com/Jackett/Jackett
type: application
-version: 0.0.2
+version: 0.0.3
annotations:
truecharts.org/catagories: |
- docker
diff --git a/dev/docker-compose/0.0.2/README.md b/dev/docker-compose/0.0.3/README.md
similarity index 100%
rename from dev/docker-compose/0.0.2/README.md
rename to dev/docker-compose/0.0.3/README.md
diff --git a/dev/docker-compose/0.0.2/app-readme.md b/dev/docker-compose/0.0.3/app-readme.md
similarity index 100%
rename from dev/docker-compose/0.0.2/app-readme.md
rename to dev/docker-compose/0.0.3/app-readme.md
diff --git a/dev/docker-compose/0.0.2/charts/common-8.16.0.tgz b/dev/docker-compose/0.0.3/charts/common-8.16.0.tgz
similarity index 100%
rename from dev/docker-compose/0.0.2/charts/common-8.16.0.tgz
rename to dev/docker-compose/0.0.3/charts/common-8.16.0.tgz
diff --git a/dev/docker-compose/0.0.2/helm-values.md b/dev/docker-compose/0.0.3/helm-values.md
similarity index 78%
rename from dev/docker-compose/0.0.2/helm-values.md
rename to dev/docker-compose/0.0.3/helm-values.md
index 828c079376..481b391db0 100644
--- a/dev/docker-compose/0.0.2/helm-values.md
+++ b/dev/docker-compose/0.0.3/helm-values.md
@@ -18,11 +18,21 @@ You will, however, be able to use all values referenced in the common chart here
| controller.rollingUpdate.unavailable | int | `1` | Set deployment RollingUpdate max unavailable |
| controller.strategy | string | `"RollingUpdate"` | Set the controller upgrade strategy For Deployments, valid values are Recreate (default) and RollingUpdate. For StatefulSets, valid values are OnDelete and RollingUpdate (default). DaemonSets ignore this. |
| controller.type | string | `"statefulset"` | Set the controller type. Valid options are deployment, daemonset or statefulset |
+| env.COMPOSE_FILE | string | `""` | |
| env.DOCKER_TLS_CERTDIR | string | `"/certs"` | |
| hostNetwork | bool | `true` | |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"tccr.io/truecharts/docker-in-docker"` | |
| image.tag | string | `"v20.10.12@sha256:c62daf2fbd0b520a5849a5b463b059207e3669c892131eff1f0cf22d3b053deb"` | |
+| lifecycle.postStart.exec.command[0] | string | `"/bin/sh"` | |
+| lifecycle.postStart.exec.command[1] | string | `"-c"` | |
+| lifecycle.postStart.exec.command[2] | string | `"sleep 20 && if [ ${COMPOSE_FILE} ]; then docker-compose up -d -f ${COMPOSE_FILE} && echo \"Loading COMPOSE_FILE at location ${COMPOSE_FILE}\"; else echo \"COMPOSE_FILE not set, not auto-loading compose-file\"; fi"` | |
+| persistence.cluster.enabled | bool | `true` | |
+| persistence.cluster.hostPath | string | `"/cluster"` | |
+| persistence.cluster.hostPathType | string | `""` | |
+| persistence.cluster.mountPath | string | `"/cluster"` | |
+| persistence.cluster.readOnly | bool | `false` | |
+| persistence.cluster.type | string | `"hostPath"` | |
| persistence.docker-certs-ca.enabled | bool | `true` | |
| persistence.docker-certs-ca.mountPath | string | `"/config"` | |
| persistence.mnt.enabled | bool | `true` | |
@@ -41,6 +51,9 @@ You will, however, be able to use all values referenced in the common chart here
| podSecurityContext.fsGroup | int | `0` | |
| podSecurityContext.runAsGroup | int | `0` | |
| podSecurityContext.runAsUser | int | `0` | |
+| probes.liveness.spec.initialDelaySeconds | int | `30` | |
+| probes.readiness.spec.initialDelaySeconds | int | `30` | |
+| probes.startup.spec.initialDelaySeconds | int | `30` | |
| securityContext.allowPrivilegeEscalation | bool | `true` | |
| securityContext.privileged | bool | `true` | |
| securityContext.readOnlyRootFilesystem | bool | `false` | |
diff --git a/dev/docker-compose/0.0.2/ix_values.yaml b/dev/docker-compose/0.0.3/ix_values.yaml
similarity index 73%
rename from dev/docker-compose/0.0.2/ix_values.yaml
rename to dev/docker-compose/0.0.3/ix_values.yaml
index 8d2150ca14..6dcb614f90 100644
--- a/dev/docker-compose/0.0.2/ix_values.yaml
+++ b/dev/docker-compose/0.0.3/ix_values.yaml
@@ -47,6 +47,27 @@ service:
env:
DOCKER_TLS_CERTDIR: "/certs"
+ COMPOSE_FILE: ""
+
+lifecycle:
+ postStart:
+ exec:
+ command:
+ - "/bin/sh"
+ - "-c"
+ - 'sleep 20 && if [ ${COMPOSE_FILE} ]; then docker-compose up -d -f ${COMPOSE_FILE} && echo "Loading COMPOSE_FILE at location ${COMPOSE_FILE}"; else echo "COMPOSE_FILE not set, not auto-loading compose-file"; fi'
+
+
+probes:
+ liveness:
+ spec:
+ initialDelaySeconds: 30
+ readiness:
+ spec:
+ initialDelaySeconds: 30
+ startup:
+ spec:
+ initialDelaySeconds: 30
persistence:
varrun:
@@ -65,6 +86,13 @@ persistence:
mountPath: /root
hostPathType: ""
readOnly: false
+ cluster:
+ enabled: true
+ type: hostPath
+ hostPath: /cluster
+ mountPath: /cluster
+ hostPathType: ""
+ readOnly: false
docker-certs-ca:
enabled: true
mountPath: "/config"
diff --git a/dev/docker-compose/0.0.2/questions.yaml b/dev/docker-compose/0.0.3/questions.yaml
similarity index 99%
rename from dev/docker-compose/0.0.2/questions.yaml
rename to dev/docker-compose/0.0.3/questions.yaml
index c18b3e807b..8c062f93db 100644
--- a/dev/docker-compose/0.0.2/questions.yaml
+++ b/dev/docker-compose/0.0.3/questions.yaml
@@ -25,30 +25,9 @@ groups:
description: "Addon Configuration"
- name: "Advanced"
description: "Advanced Configuration"
-portals:
- open:
- protocols:
- - "$kubernetes-resource_configmap_portal_protocol"
- host:
- - "$kubernetes-resource_configmap_portal_host"
- ports:
- - "$kubernetes-resource_configmap_portal_port"
+portals: {}
+
questions:
- - variable: portal
- group: "Container Image"
- label: "Configure Portal Button"
- schema:
- type: dict
- hidden: true
- attrs:
- - variable: enabled
- label: "Enable"
- description: "enable the portal button"
- schema:
- hidden: true
- editable: false
- type: boolean
- default: true
- variable: global
label: "global settings"
group: "Controller"
@@ -190,6 +169,11 @@ questions:
schema:
type: string
default: "002"
+ - variable: COMPOSE_FILE
+ label: "COMPOSE_FILE"
+ description: "Path on the host of the composefile you want to load. Supported are paths inside /mnt, /root and /cluster"
+ schema:
+ type: string
- variable: envList
label: "Image environment"
diff --git a/dev/docker-compose/0.0.2/security.md b/dev/docker-compose/0.0.3/security.md
similarity index 100%
rename from dev/docker-compose/0.0.2/security.md
rename to dev/docker-compose/0.0.3/security.md
diff --git a/dev/docker-compose/0.0.2/templates/common.yaml b/dev/docker-compose/0.0.3/templates/common.yaml
similarity index 100%
rename from dev/docker-compose/0.0.2/templates/common.yaml
rename to dev/docker-compose/0.0.3/templates/common.yaml
diff --git a/dev/docker-compose/0.0.2/values.yaml b/dev/docker-compose/0.0.3/values.yaml
similarity index 100%
rename from dev/docker-compose/0.0.2/values.yaml
rename to dev/docker-compose/0.0.3/values.yaml