From 178808e16030b7772b435d3b075e451b27612e52 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 08:52:34 -0700 Subject: [PATCH 01/13] updaing s2i image build file to pull latest docker client --- .github/workflows/reusable-build-s2i.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index 4bbdadc73..fe1f4ff3d 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -65,6 +65,11 @@ jobs: with: ref: ${{ inputs.ref }} + - name: Update Docker to Latest Version + run: | + sudo apt-get update + sudo apt-get install --only-upgrade docker-ce + - name: Login to Artifactory to Pull Images in S2I Build env: ARTIFACTORY_REGISTRY: ${{ secrets.artifactory-registry }} From 9f60fa44035311ceec77ae71fb2634b788761fb0 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 09:28:31 -0700 Subject: [PATCH 02/13] checking docker version --- .github/workflows/reusable-build-s2i.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index fe1f4ff3d..11165942f 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -70,6 +70,9 @@ jobs: sudo apt-get update sudo apt-get install --only-upgrade docker-ce + - name: Verify Docker Version + run: docker --version + - name: Login to Artifactory to Pull Images in S2I Build env: ARTIFACTORY_REGISTRY: ${{ secrets.artifactory-registry }} From 8964c3b578c282bb86a5e0cb65987e4db95b9c99 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 09:35:58 -0700 Subject: [PATCH 03/13] checkign apptainer version --- .github/workflows/reusable-build-s2i.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index 11165942f..600efef17 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -73,6 +73,9 @@ jobs: - name: Verify Docker Version run: docker --version + - name: Verify apptainer Version + run: apptainer --version + - name: Login to Artifactory to Pull Images in S2I Build env: ARTIFACTORY_REGISTRY: ${{ secrets.artifactory-registry }} From 8d5cd9ae3481f3f0c34cd1be2a03b50c7e56fe00 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 10:49:36 -0700 Subject: [PATCH 04/13] updating docker cli --- .github/workflows/reusable-build-s2i.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index 600efef17..e57fe769c 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -67,15 +67,12 @@ jobs: - name: Update Docker to Latest Version run: | - sudo apt-get update - sudo apt-get install --only-upgrade docker-ce + sudo apt-get install -y docker-ce docker-ce-cli containerd.io + docker --version - name: Verify Docker Version run: docker --version - - name: Verify apptainer Version - run: apptainer --version - - name: Login to Artifactory to Pull Images in S2I Build env: ARTIFACTORY_REGISTRY: ${{ secrets.artifactory-registry }} From 02fadd81b222233c218db0081daf0ab3c5b01d28 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 11:37:33 -0700 Subject: [PATCH 05/13] podman update --- .github/workflows/reusable-build-s2i.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index e57fe769c..758349917 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -65,6 +65,15 @@ jobs: with: ref: ${{ inputs.ref }} + - name: Update Podman to Latest Version + run: | + sudo apt-get update + sudo apt-get install -y podman + podman --version + + - name: Verify Podman Version + run: podman --version + - name: Update Docker to Latest Version run: | sudo apt-get install -y docker-ce docker-ce-cli containerd.io From 8f694327d933420aad677541b3750d3333a2615b Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 11:47:14 -0700 Subject: [PATCH 06/13] version updates --- .github/workflows/reusable-build-s2i.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index 758349917..de9863e60 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -61,7 +61,7 @@ jobs: echo "IMAGE_TAGS=${{ inputs.image-tags }}" >> $GITHUB_ENV - name: Check out - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: ${{ inputs.ref }} @@ -88,7 +88,7 @@ jobs: ARTIFACTORY_USERNAME: ${{ secrets.artifactory-username }} ARTIFACTORY_PASSWORD: ${{ secrets.artifactory-password }} if: env.ARTIFACTORY_REGISTRY && env.ARTIFACTORY_USERNAME && env.ARTIFACTORY_PASSWORD - uses: redhat-actions/podman-login@v1 + uses: redhat-actions/podman-login@v1.7 with: registry: ${{ secrets.artifactory-registry }} username: ${{ secrets.artifactory-username }} @@ -96,7 +96,7 @@ jobs: - name: S2I Build id: build-image - uses: redhat-actions/s2i-build@v2 + uses: redhat-actions/s2i-build@v2.4 with: builder_image: registry.access.redhat.com/ubi8/python-38:latest env_vars: |- @@ -111,7 +111,7 @@ jobs: - name: Push Image to The Q if: inputs.push-theq - uses: redhat-actions/push-to-registry@v2 + uses: redhat-actions/push-to-registry@v2.8 with: extra-args: --log-level=debug image: ${{ steps.build-image.outputs.image }} @@ -125,7 +125,7 @@ jobs: - name: Push Image to QMS if: inputs.push-qms - uses: redhat-actions/push-to-registry@v2 + uses: redhat-actions/push-to-registry@v2.8 with: extra-args: --log-level=debug image: ${{ steps.build-image.outputs.image }} From 231f8c8567e0882dfee72c1d63fbdd8fe46a2800 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 12:51:14 -0700 Subject: [PATCH 07/13] explicitly setting client version --- .github/workflows/reusable-build-s2i.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index de9863e60..d41ca77a7 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -111,6 +111,8 @@ jobs: - name: Push Image to The Q if: inputs.push-theq + env: + DOCKER_API_VERSION: 1.41 uses: redhat-actions/push-to-registry@v2.8 with: extra-args: --log-level=debug From f256019d0a6e22384a9df6e924f99a120fd10b47 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 13:25:47 -0700 Subject: [PATCH 08/13] updating cli --- .github/workflows/reusable-build-s2i.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index d41ca77a7..5e7158f1f 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -77,10 +77,14 @@ jobs: - name: Update Docker to Latest Version run: | sudo apt-get install -y docker-ce docker-ce-cli containerd.io + sudo systemctl start docker + sudo systemctl enable docker docker --version - name: Verify Docker Version - run: docker --version + run: | + docker version + docker info - name: Login to Artifactory to Pull Images in S2I Build env: From b4d74d6c43e89def0d54dfe2d6815b83d6d90614 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 13:40:26 -0700 Subject: [PATCH 09/13] updating podman version --- .github/workflows/reusable-build-s2i.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index 5e7158f1f..b5057051c 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -68,7 +68,10 @@ jobs: - name: Update Podman to Latest Version run: | sudo apt-get update - sudo apt-get install -y podman + sudo apt-get install -y wget + wget https://github.com/containers/podman/releases/download/v4.9.2/podman-4.9.2-static-linux-amd64.tar.gz + tar -xvf podman-4.9.2-static-linux-amd64.tar.gz + sudo mv podman /usr/local/bin/ podman --version - name: Verify Podman Version From 14ee338bf9c3307cf2be140abf8af0c86fe7fb2a Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 13:57:37 -0700 Subject: [PATCH 10/13] downgrading version of dcoker --- .github/workflows/reusable-build-s2i.yaml | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index b5057051c..affc0d33a 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -65,21 +65,17 @@ jobs: with: ref: ${{ inputs.ref }} - - name: Update Podman to Latest Version - run: | - sudo apt-get update - sudo apt-get install -y wget - wget https://github.com/containers/podman/releases/download/v4.9.2/podman-4.9.2-static-linux-amd64.tar.gz - tar -xvf podman-4.9.2-static-linux-amd64.tar.gz - sudo mv podman /usr/local/bin/ - podman --version - - name: Verify Podman Version run: podman --version - - name: Update Docker to Latest Version + - name: Install Specific Version of Docker run: | - sudo apt-get install -y docker-ce docker-ce-cli containerd.io + sudo apt-get update + sudo apt-get install -y apt-transport-https ca-certificates curl software-properties-common + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" + sudo apt-get update + sudo apt-get install -y docker-ce=5:23.0.0-1~ubuntu.20.04 docker-ce-cli=5:23.0.0-1~ubuntu.20.04 containerd.io sudo systemctl start docker sudo systemctl enable docker docker --version From cff7cbce338f1f412c89ed76b23f7e674b391028 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 14:10:41 -0700 Subject: [PATCH 11/13] ubujtu version change --- .github/workflows/reusable-build-s2i.yaml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index affc0d33a..5ca387a33 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -48,7 +48,7 @@ on: jobs: build: name: S2I Build - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Process Image Tags @@ -68,18 +68,6 @@ jobs: - name: Verify Podman Version run: podman --version - - name: Install Specific Version of Docker - run: | - sudo apt-get update - sudo apt-get install -y apt-transport-https ca-certificates curl software-properties-common - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-get install -y docker-ce=5:23.0.0-1~ubuntu.20.04 docker-ce-cli=5:23.0.0-1~ubuntu.20.04 containerd.io - sudo systemctl start docker - sudo systemctl enable docker - docker --version - - name: Verify Docker Version run: | docker version From 15d3074ac589152d90cd8a474926e25e86b5b774 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 14:20:38 -0700 Subject: [PATCH 12/13] removing explicit api version number --- .github/workflows/reusable-build-s2i.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index 5ca387a33..07b062637 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -102,8 +102,6 @@ jobs: - name: Push Image to The Q if: inputs.push-theq - env: - DOCKER_API_VERSION: 1.41 uses: redhat-actions/push-to-registry@v2.8 with: extra-args: --log-level=debug From 6863122fda2d54e5f8cac4c51004307466350215 Mon Sep 17 00:00:00 2001 From: josekudiyirippil Date: Thu, 13 Jun 2024 14:35:14 -0700 Subject: [PATCH 13/13] updating ubuntu --- .github/workflows/reusable-build-s2i.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable-build-s2i.yaml b/.github/workflows/reusable-build-s2i.yaml index 07b062637..8d043ad7e 100644 --- a/.github/workflows/reusable-build-s2i.yaml +++ b/.github/workflows/reusable-build-s2i.yaml @@ -48,7 +48,7 @@ on: jobs: build: name: S2I Build - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Process Image Tags @@ -66,7 +66,9 @@ jobs: ref: ${{ inputs.ref }} - name: Verify Podman Version - run: podman --version + run: | + podman --version + lsb_release -a - name: Verify Docker Version run: |