diff --git a/charts/dev/docker-compose/CHANGELOG.md b/charts/dev/docker-compose/CHANGELOG.md index 10c4e19b6bc..8855e0c8833 100644 --- a/charts/dev/docker-compose/CHANGELOG.md +++ b/charts/dev/docker-compose/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/charts/dev/docker-compose/helm-values.md b/charts/dev/docker-compose/helm-values.md index 6f3ef2d9921..347c18d1981 100644 --- a/charts/dev/docker-compose/helm-values.md +++ b/charts/dev/docker-compose/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/charts/dev/docker-compose/security.md b/charts/dev/docker-compose/security.md index 29bd7766f06..a3b1a2b23e0 100644 --- a/charts/dev/docker-compose/security.md +++ b/charts/dev/docker-compose/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/docs/apps/dev/docker-compose/CHANGELOG.md b/docs/apps/dev/docker-compose/CHANGELOG.md index 10c4e19b6bc..8855e0c8833 100644 --- a/docs/apps/dev/docker-compose/CHANGELOG.md +++ b/docs/apps/dev/docker-compose/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/docs/apps/dev/docker-compose/helm-values.md b/docs/apps/dev/docker-compose/helm-values.md index 6f3ef2d9921..347c18d1981 100644 --- a/docs/apps/dev/docker-compose/helm-values.md +++ b/docs/apps/dev/docker-compose/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/docs/apps/dev/docker-compose/security.md b/docs/apps/dev/docker-compose/security.md index 29bd7766f06..a3b1a2b23e0 100644 --- a/docs/apps/dev/docker-compose/security.md +++ b/docs/apps/dev/docker-compose/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/docs/index.yaml b/docs/index.yaml index 6ce9c7321e3..99091cc31ce 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -9574,6 +9574,38 @@ entries: - https://github.com/truecharts/apps/releases/download/dizquetv-4.0.19/dizquetv-4.0.19.tgz version: 4.0.19 docker-compose: + - annotations: + truecharts.org/SCALE-support: "true" + truecharts.org/catagories: | + - docker + - test + truecharts.org/grade: U + apiVersion: v2 + appVersion: 20.10.12 + created: "2022-02-24T22:38:16.000156264Z" + dependencies: + - name: common + repository: https://truecharts.org + version: 8.16.0 + description: Dedicated App for using Docker-Compose on TrueNAS SCALE + digest: c1f9d6013190bf7da5dc1a84feedea2a46d552752a040188a94f66c3c8687470 + home: https://github.com/truecharts/apps/tree/master/charts/dev/docker-compose + icon: https://truecharts.org/_static/img/appicons/docker-compose-icon.png + keywords: + - docker-compose + - docker + kubeVersion: '>=1.16.0-0' + maintainers: + - email: info@truecharts.org + name: TrueCharts + url: https://truecharts.org + name: docker-compose + sources: + - https://github.com/Jackett/Jackett + type: application + urls: + - https://github.com/truecharts/apps/releases/download/docker-compose-0.0.5/docker-compose-0.0.5.tgz + version: 0.0.5 - annotations: truecharts.org/SCALE-support: "true" truecharts.org/catagories: | @@ -64531,4 +64563,4 @@ entries: urls: - https://github.com/truecharts/apps/releases/download/zwavejs2mqtt-9.0.24/zwavejs2mqtt-9.0.24.tgz version: 9.0.24 -generated: "2022-02-24T21:06:46.836399254Z" +generated: "2022-02-24T22:38:16.006267456Z"