From 8cfc77d95c3c7b92ae275298cf5cd8c0d64cee8b Mon Sep 17 00:00:00 2001 From: minottic Date: Tue, 28 May 2024 17:47:56 +0200 Subject: [PATCH 1/3] Remove comment --- services/backend/services/v3/compose.yaml | 1 + services/compose.yaml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/services/backend/services/v3/compose.yaml b/services/backend/services/v3/compose.yaml index d1b5c271..99c5ef35 100644 --- a/services/backend/services/v3/compose.yaml +++ b/services/backend/services/v3/compose.yaml @@ -2,3 +2,4 @@ include: - path: - ./compose.base.yaml - ../../..${JOBS_ENABLED:+/backend/services/v3}/compose${JOBS_ENABLED:+.jobs}.yaml + - ../../..${JOBS_ENABLED:+/backend/services/v3}/compose${JOBS_ENABLED:+.jobs}.yaml diff --git a/services/compose.yaml b/services/compose.yaml index 1d826e5c..e69de29b 100644 --- a/services/compose.yaml +++ b/services/compose.yaml @@ -1 +0,0 @@ -## empty file used when override configs are not enabled From c741f8b74d04dcd4512eda34c2d09fcb228094d6 Mon Sep 17 00:00:00 2001 From: minottic Date: Tue, 28 May 2024 18:07:29 +0200 Subject: [PATCH 2/3] Try to upgrade docker --- .github/workflows/compose_test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/compose_test.yaml b/.github/workflows/compose_test.yaml index d559755e..3fd808d7 100644 --- a/.github/workflows/compose_test.yaml +++ b/.github/workflows/compose_test.yaml @@ -59,6 +59,7 @@ jobs: - uses: actions/checkout@v4 - name: Test compose.yaml run: |- + apt-get upgrade docker-ce export JOBS_ENABLED=${{ matrix.JOBS_AND_ELASTIC_ENABLED }} export ELASTIC_ENABLED=${{ matrix.JOBS_AND_ELASTIC_ENABLED }} export BE_VERSION=${{ matrix.BE_VERSION }} From 765508166b76f0bcac8b1c26bcda183a955e032a Mon Sep 17 00:00:00 2001 From: minottic Date: Tue, 28 May 2024 18:07:51 +0200 Subject: [PATCH 3/3] Update docker --- .github/workflows/compose_test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/compose_test.yaml b/.github/workflows/compose_test.yaml index 3fd808d7..914a8173 100644 --- a/.github/workflows/compose_test.yaml +++ b/.github/workflows/compose_test.yaml @@ -59,7 +59,9 @@ jobs: - uses: actions/checkout@v4 - name: Test compose.yaml run: |- + docker version apt-get upgrade docker-ce + docker version export JOBS_ENABLED=${{ matrix.JOBS_AND_ELASTIC_ENABLED }} export ELASTIC_ENABLED=${{ matrix.JOBS_AND_ELASTIC_ENABLED }} export BE_VERSION=${{ matrix.BE_VERSION }}