From 3e8f804c860b6e79824c07c186b7b6844a912d0d Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 5 Apr 2023 14:16:14 -0400 Subject: [PATCH 1/4] Update daily-build.yml --- .github/workflows/daily-build.yml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 728ae669..61e0817f 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -82,9 +82,21 @@ jobs: - name: Set permissions run: chmod +x ${{ matrix.repos }}/scripts/*.sh - name: Docker login for runner - run: echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin + run: | + if [ ${{ matrix.repos }} = "guide-liberty-deep-dive-gradle" ] + then + echo $DOCKER_PASSWORD | podman login -u $DOCKER_USERNAME --password-stdin + else + echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin + fi - name: Docker login for root - run: echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin + run: | + if [ ${{ matrix.repos }} = "guide-liberty-deep-dive-gradle" ] + then + echo $DOCKER_PASSWORD | sudo podman login -u $DOCKER_USERNAME --password-stdin + else + echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin + fi - name: Run tests for ${{ matrix.repos }} working-directory: ${{ matrix.repos }}/finish env: From 41c01261dfa06840b15b3638693fc5d09cc951f9 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 5 Apr 2023 14:17:51 -0400 Subject: [PATCH 2/4] Update daily-build.yml --- .github/workflows/daily-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 61e0817f..1fd64b25 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -85,7 +85,7 @@ jobs: run: | if [ ${{ matrix.repos }} = "guide-liberty-deep-dive-gradle" ] then - echo $DOCKER_PASSWORD | podman login -u $DOCKER_USERNAME --password-stdin + echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin else echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin fi @@ -93,7 +93,7 @@ jobs: run: | if [ ${{ matrix.repos }} = "guide-liberty-deep-dive-gradle" ] then - echo $DOCKER_PASSWORD | sudo podman login -u $DOCKER_USERNAME --password-stdin + echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin else echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin fi From d07f6aa1e2f78636524e418b6450dbbcca13f683 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 5 Apr 2023 14:30:44 -0400 Subject: [PATCH 3/4] Update daily-build.yml --- .github/workflows/daily-build.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index 1fd64b25..ff750042 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -83,18 +83,20 @@ jobs: run: chmod +x ${{ matrix.repos }}/scripts/*.sh - name: Docker login for runner run: | - if [ ${{ matrix.repos }} = "guide-liberty-deep-dive-gradle" ] - then + if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ] then + echo podman login echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin else + echo docker login echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin fi - name: Docker login for root run: | - if [ ${{ matrix.repos }} = "guide-liberty-deep-dive-gradle" ] - then + if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ] then + echo podman login echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin else + echo docker login echo $DOCKER_PASSWORD | sudo docker login -u $DOCKER_USERNAME --password-stdin fi - name: Run tests for ${{ matrix.repos }} From 58081cd8d4ae8535b97c8f7d19c8d5d264d3dba8 Mon Sep 17 00:00:00 2001 From: Gilbert Kwan Date: Wed, 5 Apr 2023 15:14:38 -0400 Subject: [PATCH 4/4] Update daily-build.yml --- .github/workflows/daily-build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/daily-build.yml b/.github/workflows/daily-build.yml index ff750042..d044c524 100644 --- a/.github/workflows/daily-build.yml +++ b/.github/workflows/daily-build.yml @@ -83,7 +83,8 @@ jobs: run: chmod +x ${{ matrix.repos }}/scripts/*.sh - name: Docker login for runner run: | - if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ] then + if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ] + then echo podman login echo $DOCKER_PASSWORD | podman login docker.io -u $DOCKER_USERNAME --password-stdin else @@ -92,7 +93,8 @@ jobs: fi - name: Docker login for root run: | - if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ] then + if [ "${{ matrix.repos }}" = "guide-liberty-deep-dive-gradle" ] + then echo podman login echo $DOCKER_PASSWORD | sudo podman login docker.io -u $DOCKER_USERNAME --password-stdin else