From 1b95eb034d41392e97e91acb60c11393cab9dd76 Mon Sep 17 00:00:00 2001 From: TrueCharts-Bot Date: Thu, 24 Feb 2022 22:38:19 +0000 Subject: [PATCH] Commit new App releases for TrueCharts Signed-off-by: TrueCharts-Bot --- .../{0.0.4 => 0.0.5}/CHANGELOG.md | 9 ++++++++ dev/docker-compose/{0.0.4 => 0.0.5}/CONFIG.md | 0 .../{0.0.4 => 0.0.5}/Chart.lock | 2 +- .../{0.0.4 => 0.0.5}/Chart.yaml | 2 +- dev/docker-compose/{0.0.4 => 0.0.5}/README.md | 0 .../{0.0.4 => 0.0.5}/app-readme.md | 0 .../{0.0.4 => 0.0.5}/charts/common-8.16.0.tgz | Bin .../{0.0.4 => 0.0.5}/helm-values.md | 6 ++--- .../{0.0.4 => 0.0.5}/ix_values.yaml | 21 +++++++++++------- .../{0.0.4 => 0.0.5}/questions.yaml | 0 .../{0.0.4 => 0.0.5}/security.md | 4 ++-- .../{0.0.4 => 0.0.5}/templates/common.yaml | 0 .../{0.0.4 => 0.0.5}/values.yaml | 0 13 files changed, 29 insertions(+), 15 deletions(-) rename dev/docker-compose/{0.0.4 => 0.0.5}/CHANGELOG.md (76%) rename dev/docker-compose/{0.0.4 => 0.0.5}/CONFIG.md (100%) rename dev/docker-compose/{0.0.4 => 0.0.5}/Chart.lock (78%) rename dev/docker-compose/{0.0.4 => 0.0.5}/Chart.yaml (97%) rename dev/docker-compose/{0.0.4 => 0.0.5}/README.md (100%) rename dev/docker-compose/{0.0.4 => 0.0.5}/app-readme.md (100%) rename dev/docker-compose/{0.0.4 => 0.0.5}/charts/common-8.16.0.tgz (100%) rename dev/docker-compose/{0.0.4 => 0.0.5}/helm-values.md (85%) rename dev/docker-compose/{0.0.4 => 0.0.5}/ix_values.yaml (76%) rename dev/docker-compose/{0.0.4 => 0.0.5}/questions.yaml (100%) rename dev/docker-compose/{0.0.4 => 0.0.5}/security.md (99%) rename dev/docker-compose/{0.0.4 => 0.0.5}/templates/common.yaml (100%) rename dev/docker-compose/{0.0.4 => 0.0.5}/values.yaml (100%) diff --git a/dev/docker-compose/0.0.4/CHANGELOG.md b/dev/docker-compose/0.0.5/CHANGELOG.md similarity index 76% rename from dev/docker-compose/0.0.4/CHANGELOG.md rename to dev/docker-compose/0.0.5/CHANGELOG.md index 10c4e19b6bc..8855e0c8833 100644 --- a/dev/docker-compose/0.0.4/CHANGELOG.md +++ b/dev/docker-compose/0.0.5/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog
+ +### [docker-compose-0.0.5](https://github.com/truecharts/apps/compare/docker-compose-0.0.4...docker-compose-0.0.5) (2022-02-24) + +#### Feat + +* wait for docker to be running before loading docker-compose file ([#1960](https://github.com/truecharts/apps/issues/1960)) + + + ### [docker-compose-0.0.4](https://github.com/truecharts/apps/compare/docker-compose-0.0.3...docker-compose-0.0.4) (2022-02-24) diff --git a/dev/docker-compose/0.0.4/CONFIG.md b/dev/docker-compose/0.0.5/CONFIG.md similarity index 100% rename from dev/docker-compose/0.0.4/CONFIG.md rename to dev/docker-compose/0.0.5/CONFIG.md diff --git a/dev/docker-compose/0.0.4/Chart.lock b/dev/docker-compose/0.0.5/Chart.lock similarity index 78% rename from dev/docker-compose/0.0.4/Chart.lock rename to dev/docker-compose/0.0.5/Chart.lock index 55baf55aeab..49008a7e99c 100644 --- a/dev/docker-compose/0.0.4/Chart.lock +++ b/dev/docker-compose/0.0.5/Chart.lock @@ -3,4 +3,4 @@ dependencies: repository: https://truecharts.org version: 8.16.0 digest: sha256:fa603eaefc7f57029052919d45fd45424e58a69f707af7b657afd49a4b41a435 -generated: "2022-02-24T21:03:28.539627671Z" +generated: "2022-02-24T22:34:16.896424623Z" diff --git a/dev/docker-compose/0.0.4/Chart.yaml b/dev/docker-compose/0.0.5/Chart.yaml similarity index 97% rename from dev/docker-compose/0.0.4/Chart.yaml rename to dev/docker-compose/0.0.5/Chart.yaml index c644b1ac571..0018839a693 100644 --- a/dev/docker-compose/0.0.4/Chart.yaml +++ b/dev/docker-compose/0.0.5/Chart.yaml @@ -20,7 +20,7 @@ name: docker-compose sources: - https://github.com/Jackett/Jackett type: application -version: 0.0.4 +version: 0.0.5 annotations: truecharts.org/catagories: | - docker diff --git a/dev/docker-compose/0.0.4/README.md b/dev/docker-compose/0.0.5/README.md similarity index 100% rename from dev/docker-compose/0.0.4/README.md rename to dev/docker-compose/0.0.5/README.md diff --git a/dev/docker-compose/0.0.4/app-readme.md b/dev/docker-compose/0.0.5/app-readme.md similarity index 100% rename from dev/docker-compose/0.0.4/app-readme.md rename to dev/docker-compose/0.0.5/app-readme.md diff --git a/dev/docker-compose/0.0.4/charts/common-8.16.0.tgz b/dev/docker-compose/0.0.5/charts/common-8.16.0.tgz similarity index 100% rename from dev/docker-compose/0.0.4/charts/common-8.16.0.tgz rename to dev/docker-compose/0.0.5/charts/common-8.16.0.tgz diff --git a/dev/docker-compose/0.0.4/helm-values.md b/dev/docker-compose/0.0.5/helm-values.md similarity index 85% rename from dev/docker-compose/0.0.4/helm-values.md rename to dev/docker-compose/0.0.5/helm-values.md index 6f3ef2d9921..347c18d1981 100644 --- a/dev/docker-compose/0.0.4/helm-values.md +++ b/dev/docker-compose/0.0.5/helm-values.md @@ -23,10 +23,10 @@ You will, however, be able to use all values referenced in the common chart here | 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"` | | +| image.tag | string | `"v20.10.12@sha256:06af3ce416ac5d30697178378f164a9a9494bc5dcb182b0f441ed9f5087a5fe7"` | | +| lifecycle.postStart.exec.command[0] | string | `"/bin/bash"` | | | 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}\" >> /proc/1/fd/1; else echo \"COMPOSE_FILE not set, not auto-loading compose-file\" >> /proc/1/fd/1; fi\n"` | | +| lifecycle.postStart.exec.command[2] | string | `"if [ \"${COMPOSE_FILE}\" ]; then\ncounter=0;\nwhile ! docker info > /dev/null 2>&1 && [[ ${counter} -lt 10 ]]; do\necho \"docker not running yet. Waiting...\" >> /proc/1/fd/1;\nsleep 5;\ncounter=$((counter+1));\ndone\ndocker-compose up -d -f \"${COMPOSE_FILE}\" && echo \"Loading COMPOSE_FILE at location ${COMPOSE_FILE}\" >> /proc/1/fd/1;\nelse\necho \"COMPOSE_FILE not set, not auto-loading compose-file\" >> /proc/1/fd/1;\nfi\n"` | | | persistence.cluster.enabled | bool | `true` | | | persistence.cluster.hostPath | string | `"/cluster"` | | | persistence.cluster.hostPathType | string | `""` | | diff --git a/dev/docker-compose/0.0.4/ix_values.yaml b/dev/docker-compose/0.0.5/ix_values.yaml similarity index 76% rename from dev/docker-compose/0.0.4/ix_values.yaml rename to dev/docker-compose/0.0.5/ix_values.yaml index 275b6a3c9cc..fea75cefa13 100644 --- a/dev/docker-compose/0.0.4/ix_values.yaml +++ b/dev/docker-compose/0.0.5/ix_values.yaml @@ -1,7 +1,7 @@ image: repository: tccr.io/truecharts/docker-in-docker pullPolicy: IfNotPresent - tag: v20.10.12@sha256:c62daf2fbd0b520a5849a5b463b059207e3669c892131eff1f0cf22d3b053deb + tag: v20.10.12@sha256:06af3ce416ac5d30697178378f164a9a9494bc5dcb182b0f441ed9f5087a5fe7 controller: # -- Set the controller type. @@ -53,15 +53,20 @@ lifecycle: postStart: exec: command: - - "/bin/sh" + - "/bin/bash" - "-c" - - > - sleep 20 && if [ ${COMPOSE_FILE} ]; then - docker-compose up -d -f ${COMPOSE_FILE} && 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; + - | + 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 up -d -f "${COMPOSE_FILE}" && 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 - - probes: liveness: spec: diff --git a/dev/docker-compose/0.0.4/questions.yaml b/dev/docker-compose/0.0.5/questions.yaml similarity index 100% rename from dev/docker-compose/0.0.4/questions.yaml rename to dev/docker-compose/0.0.5/questions.yaml diff --git a/dev/docker-compose/0.0.4/security.md b/dev/docker-compose/0.0.5/security.md similarity index 99% rename from dev/docker-compose/0.0.4/security.md rename to dev/docker-compose/0.0.5/security.md index 08b7fce2ae6..3d7fda0adb0 100644 --- a/dev/docker-compose/0.0.4/security.md +++ b/dev/docker-compose/0.0.5/security.md @@ -49,7 +49,7 @@ hide: tccr.io/truecharts/alpine:v3.14.2@sha256:4095394abbae907e94b1f2fd2e2de6c4f201a5b9704573243ca8eb16db8cdb7c tccr.io/truecharts/alpine:v3.14.2@sha256:4095394abbae907e94b1f2fd2e2de6c4f201a5b9704573243ca8eb16db8cdb7c - tccr.io/truecharts/docker-in-docker:v20.10.12@sha256:c62daf2fbd0b520a5849a5b463b059207e3669c892131eff1f0cf22d3b053deb + tccr.io/truecharts/docker-in-docker:v20.10.12@sha256:06af3ce416ac5d30697178378f164a9a9494bc5dcb182b0f441ed9f5087a5fe7 ##### Scan Results @@ -118,7 +118,7 @@ hide: | ssl_client | CVE-2021-42375 | MEDIUM | 1.33.1-r3 | 1.33.1-r5 |
Expand...https://jfrog.com/blog/unboxing-busybox-14-new-vulnerabilities-uncovered-by-claroty-and-jfrog/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/6T2TURBYYJGBMQTTN2DSOAIQGP7WCPGV/
https://lists.fedoraproject.org/archives/list/package-announce@lists.fedoraproject.org/message/UQXGOGWBIYWOIVXJVRKHZR34UMEHQBXS/
https://security.netapp.com/advisory/ntap-20211223-0002/
| -#### Container: tccr.io/truecharts/docker-in-docker:v20.10.12@sha256:c62daf2fbd0b520a5849a5b463b059207e3669c892131eff1f0cf22d3b053deb (alpine 3.15.0) +#### Container: tccr.io/truecharts/docker-in-docker:v20.10.12@sha256:06af3ce416ac5d30697178378f164a9a9494bc5dcb182b0f441ed9f5087a5fe7 (alpine 3.15.0) **alpine** diff --git a/dev/docker-compose/0.0.4/templates/common.yaml b/dev/docker-compose/0.0.5/templates/common.yaml similarity index 100% rename from dev/docker-compose/0.0.4/templates/common.yaml rename to dev/docker-compose/0.0.5/templates/common.yaml diff --git a/dev/docker-compose/0.0.4/values.yaml b/dev/docker-compose/0.0.5/values.yaml similarity index 100% rename from dev/docker-compose/0.0.4/values.yaml rename to dev/docker-compose/0.0.5/values.yaml