From e2512c7cdcd67e753d3371861680042e1c845235 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Mon, 15 Nov 2021 15:34:38 +0000 Subject: [PATCH 1/3] Testing images are pushed to DOCKER_ORG_TESTS again. --- .github/workflows/CI.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index e2a535dd..5f298224 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,9 +19,9 @@ on: ############################################### # REQUIRED secrets # DOCKER_UN: ${{ secrets.Docker_Login }} -# Username of docker login for pushing the images to repo $DOCKER_ORG +# Username of docker login for pushing the images to repo $DOCKER_ORG and $DOCKER_ORG_TESTS # DOCKER_PW: ${{ secrets.Docker_Password }} -# Password of docker login for pushing the images to repo $DOCKER_ORG +# Password of docker login for pushing the images to repo $DOCKER_ORG and $DOCKER_ORG_TESTS # DOCKER_ORG: ${{ secrets.DOCKER_ORG }} # The docker repository where the images are pushed to. # DOCKER_ORG_TESTS: ${{ secrets.DOCKER_ORG_TESTS }} @@ -47,6 +47,7 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }} >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash @@ -54,6 +55,7 @@ jobs: MAILU_BRANCH: ${{ env.BRANCH }} run: | echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }} >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images @@ -69,16 +71,16 @@ jobs: env: DOCKER_UN: ${{ secrets.Docker_Login }} DOCKER_PW: ${{ secrets.Docker_Password }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} run: echo "$DOCKER_PW" | docker login --username $DOCKER_UN --password-stdin - name: Build all docker images env: MAILU_VERSION: ${{ env.MAILU_VERSION }} TRAVIS_BRANCH: ${{ env.BRANCH }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} run: docker-compose -f tests/build.yml build - name: Save all docker images - run: docker save ${{ secrets.DOCKER_ORG }}/admin ${{ secrets.DOCKER_ORG }}/clamav ${{ secrets.DOCKER_ORG }}/docs ${{ secrets.DOCKER_ORG }}/dovecot ${{ secrets.DOCKER_ORG }}/fetchmail ${{ secrets.DOCKER_ORG }}/nginx ${{ secrets.DOCKER_ORG }}/none ${{ secrets.DOCKER_ORG }}/postfix ${{ secrets.DOCKER_ORG }}/postgresql ${{ secrets.DOCKER_ORG }}/radicale ${{ secrets.DOCKER_ORG }}/rainloop ${{ secrets.DOCKER_ORG }}/roundcube ${{ secrets.DOCKER_ORG }}/rspamd ${{ secrets.DOCKER_ORG }}/setup ${{ secrets.DOCKER_ORG }}/traefik-certdumper ${{ secrets.DOCKER_ORG }}/unbound -o /images/images.tar.gz + run: docker save ${{ env.DOCKER_ORG }}/admin ${{ env.DOCKER_ORG }}/clamav ${{ env.DOCKER_ORG }}/docs ${{ env.DOCKER_ORG }}/dovecot ${{ env.DOCKER_ORG }}/fetchmail ${{ env.DOCKER_ORG }}/nginx ${{ env.DOCKER_ORG }}/none ${{ env.DOCKER_ORG }}/postfix ${{ env.DOCKER_ORG }}/postgresql ${{ env.DOCKER_ORG }}/radicale ${{ env.DOCKER_ORG }}/rainloop ${{ env.DOCKER_ORG }}/roundcube ${{ env.DOCKER_ORG }}/rspamd ${{ env.DOCKER_ORG }}/setup ${{ env.DOCKER_ORG }}/traefik-certdumper ${{ env.DOCKER_ORG }}/unbound -o /images/images.tar.gz test-core: name: Perform core tests @@ -125,7 +127,7 @@ jobs: env: MAILU_VERSION: ${{ env.MAILU_VERSION }} TRAVIS_BRANCH: ${{ env.BRANCH }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} test-fetchmail: name: Perform fetchmail tests @@ -172,7 +174,7 @@ jobs: env: MAILU_VERSION: ${{ env.MAILU_VERSION }} TRAVIS_BRANCH: ${{ env.BRANCH }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} test-filters: name: Perform filter tests @@ -219,7 +221,7 @@ jobs: env: MAILU_VERSION: ${{ env.MAILU_VERSION }} TRAVIS_BRANCH: ${{ env.BRANCH }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} test-rainloop: name: Perform rainloop tests @@ -266,7 +268,7 @@ jobs: env: MAILU_VERSION: ${{ env.MAILU_VERSION }} TRAVIS_BRANCH: ${{ env.BRANCH }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} test-roundcube: name: Perform roundcube tests @@ -313,7 +315,7 @@ jobs: env: MAILU_VERSION: ${{ env.MAILU_VERSION }} TRAVIS_BRANCH: ${{ env.BRANCH }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} test-webdav: name: Perform webdav tests @@ -360,7 +362,7 @@ jobs: env: MAILU_VERSION: ${{ env.MAILU_VERSION }} TRAVIS_BRANCH: ${{ env.BRANCH }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} deploy: name: Deploy images @@ -412,8 +414,7 @@ jobs: env: DOCKER_UN: ${{ secrets.Docker_Login }} DOCKER_PW: ${{ secrets.Docker_Password }} - DOCKER_ORG: ${{ secrets.DOCKER_ORG }} - DOCKER_ORG_TESTS: ${{ secrets.DOCKER_ORG_TESTS }} + DOCKER_ORG: ${{ env.DOCKER_ORG }} MAILU_VERSION: ${{ env.MAILU_VERSION }} TRAVIS_BRANCH: ${{ env.BRANCH }} run: bash tests/deploy.sh From b39169269800d5a7c5c57aa94587b9f152c25771 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Mon, 15 Nov 2021 15:44:31 +0000 Subject: [PATCH 2/3] It is handy to close strings. --- .github/workflows/CI.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 5f298224..578ed1a9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -47,7 +47,7 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV - echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }} >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }}" >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash @@ -55,7 +55,7 @@ jobs: MAILU_BRANCH: ${{ env.BRANCH }} run: | echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV - echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }} >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images From b20d0a83d5b6f369749320fff7ca1289c3160bc9 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Mon, 15 Nov 2021 16:17:31 +0000 Subject: [PATCH 3/3] Doh! --- .github/workflows/CI.yml | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 578ed1a9..dba30722 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -55,7 +55,7 @@ jobs: MAILU_BRANCH: ${{ env.BRANCH }} run: | echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV - echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images @@ -100,13 +100,15 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }}" >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash env: MAILU_BRANCH: ${{ env.BRANCH }} run: | - echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images @@ -126,7 +128,7 @@ jobs: run: python tests/compose/test.py core 2 env: MAILU_VERSION: ${{ env.MAILU_VERSION }} - TRAVIS_BRANCH: ${{ env.BRANCH }} + TRAVIS_BRANCH: ${{ env.BRANCH }} DOCKER_ORG: ${{ env.DOCKER_ORG }} test-fetchmail: @@ -147,13 +149,15 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }}" >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash env: MAILU_BRANCH: ${{ env.BRANCH }} run: | - echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images @@ -194,13 +198,15 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }}" >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash env: MAILU_BRANCH: ${{ env.BRANCH }} run: | - echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images @@ -241,13 +247,15 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }}" >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash env: MAILU_BRANCH: ${{ env.BRANCH }} run: | - echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images @@ -267,7 +275,7 @@ jobs: run: python tests/compose/test.py rainloop 2 env: MAILU_VERSION: ${{ env.MAILU_VERSION }} - TRAVIS_BRANCH: ${{ env.BRANCH }} + TRAVIS_BRANCH: ${{ env.BRANCH }} DOCKER_ORG: ${{ env.DOCKER_ORG }} test-roundcube: @@ -288,13 +296,15 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }}" >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash env: MAILU_BRANCH: ${{ env.BRANCH }} run: | - echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images @@ -314,7 +324,7 @@ jobs: run: python tests/compose/test.py roundcube 2 env: MAILU_VERSION: ${{ env.MAILU_VERSION }} - TRAVIS_BRANCH: ${{ env.BRANCH }} + TRAVIS_BRANCH: ${{ env.BRANCH }} DOCKER_ORG: ${{ env.DOCKER_ORG }} test-webdav: @@ -335,13 +345,15 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }}" >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash env: MAILU_BRANCH: ${{ env.BRANCH }} run: | - echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images @@ -389,6 +401,7 @@ jobs: COMMIT_MESSAGE: ${{ github.event.head_commit.message }} run: | echo "MAILU_VERSION=pr-${COMMIT_MESSAGE//[!0-9]/}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG_TESTS }}" >> $GITHUB_ENV - name: Derive MAILU_VERSION for other branches than testing if: ${{ env.BRANCH != 'testing' }} shell: bash @@ -396,10 +409,11 @@ jobs: MAILU_BRANCH: ${{ env.BRANCH }} run: | echo "MAILU_VERSION=${{ env.MAILU_BRANCH }}" >> $GITHUB_ENV + echo "DOCKER_ORG=${{ secrets.DOCKER_ORG }}" >> $GITHUB_ENV - name: Create folder for storing images run: | sudo mkdir -p /images - sudo chmod 777 /images + sudo chmod 777 /images - name: Configure images folder for caching # For staging we do not deploy images. So we do not have to load them from cache. if: ${{ env.BRANCH != 'staging' }} @@ -424,7 +438,7 @@ jobs: name: CI-Done #Returns true when none of the **previous** steps have failed or been canceled. if: ${{ success() }} - needs: + needs: - deploy runs-on: ubuntu-latest steps: