From 8a38817c2a81a37e9a3ce34f4a0e081618504744 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Mon, 10 Mar 2025 01:38:11 -0500 Subject: [PATCH 1/5] Update base image Signed-off-by: Sean Sundberg --- .github/workflows/docker-build.yaml | 9 ++++---- Containerfile-alpine | 32 ++++++++++++++--------------- Containerfile-fedora | 30 +++++++++++++++------------ 3 files changed, 37 insertions(+), 34 deletions(-) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index 1aa712f..e94e8d8 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -20,12 +20,13 @@ jobs: - alpine - fedora terraform: - - v1.0 - - v1.1 - - v1.2 + - v1.6 + - v1.7 + - v1.8 + - v1.9 env: - TERRAFORM_LATEST: "v1.2" + TERRAFORM_LATEST: "v1.9" steps: - name: Checkout diff --git a/Containerfile-alpine b/Containerfile-alpine index a5388c7..e7800e1 100644 --- a/Containerfile-alpine +++ b/Containerfile-alpine @@ -1,37 +1,35 @@ -ARG TERRAFORM_VERSION=v1.2 -FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v1.6.1-alpine +ARG TERRAFORM_VERSION=v1.9 +FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v2.0.0-alpine ARG TARGETPLATFORM ENV TF_CLI_ARGS_apply="-parallelism=6" +USER root + ## AWS cli -RUN sudo apk add --no-cache \ +RUN apk add --no-cache \ python3 \ py3-pip \ - && sudo pip3 install --upgrade pip \ - && sudo pip3 install awscli \ - && sudo rm -rf /var/cache/apk/* \ + && pip3 install --upgrade pip \ + && pip3 install awscli \ + && rm -rf /var/cache/apk/* \ && aws --version ## Azure cli -RUN sudo apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo make python3 py3-pip \ - && sudo pip3 install --upgrade pip \ - && sudo pip3 install azure-cli \ - && sudo rm -rf /var/cache/apk/* \ +RUN apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo make python3 py3-pip \ + && pip3 install --upgrade pip \ + && pip3 install azure-cli \ + && rm -rf /var/cache/apk/* \ && az --version +USER devops + # Install the ibmcloud cli RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \ ibmcloud plugin install container-service -f && \ ibmcloud plugin install container-registry -f && \ ibmcloud plugin install observe-service -f && \ - if [[ "$TARGETPLATFORM" != "linux/arm64" ]]; then ibmcloud plugin install vpc-infrastructure -f; fi && \ + ibmcloud plugin install vpc-infrastructure -f && \ ibmcloud config --check-version=false && \ chmod -R g=u ${HOME} - -WORKDIR ${HOME} - -VOLUME /workspaces - -ENTRYPOINT ["/bin/sh"] diff --git a/Containerfile-fedora b/Containerfile-fedora index dabe8ce..79b9496 100644 --- a/Containerfile-fedora +++ b/Containerfile-fedora @@ -1,31 +1,35 @@ -ARG TERRAFORM_VERSION=v1.2 -FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v1.6.1-fedora +ARG TERRAFORM_VERSION=v1.9 +FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v2.0.0-fedora ARG TARGETPLATFORM ENV TF_CLI_ARGS_apply="-parallelism=6" +USER root + ## AWS cli -RUN sudo dnf install -y \ +RUN apk add --no-cache \ python3 \ - python3-pip \ - && sudo pip3 install --upgrade pip \ - && sudo pip3 install awscli \ - && sudo dnf clean all \ + py3-pip \ + && pip3 install --upgrade pip \ + && pip3 install awscli \ + && rm -rf /var/cache/apk/* \ && aws --version ## Azure cli -RUN sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc && \ - sudo dnf install -y https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm && \ - sudo dnf install -y azure-cli && \ - sudo dnf clean all && \ - az --version +RUN apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo make python3 py3-pip \ + && pip3 install --upgrade pip \ + && pip3 install azure-cli \ + && rm -rf /var/cache/apk/* \ + && az --version + +USER devops # Install the ibmcloud cli RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \ ibmcloud plugin install container-service -f && \ ibmcloud plugin install container-registry -f && \ ibmcloud plugin install observe-service -f && \ - if [[ "$TARGETPLATFORM" != "linux/arm64" ]]; then ibmcloud plugin install vpc-infrastructure -f; fi && \ + ibmcloud plugin install vpc-infrastructure -f && \ ibmcloud config --check-version=false && \ chmod -R g=u ${HOME} From 3b375e855df283158d8dd0f8e471278f60b1ac78 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Mon, 10 Mar 2025 23:08:31 -0500 Subject: [PATCH 2/5] Update aws and azure cli install logic Signed-off-by: Sean Sundberg --- Containerfile-alpine | 29 +++++++++++++++++------------ Containerfile-fedora | 29 +++++++++++++++++------------ 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/Containerfile-alpine b/Containerfile-alpine index e7800e1..e58191c 100644 --- a/Containerfile-alpine +++ b/Containerfile-alpine @@ -8,23 +8,28 @@ ENV TF_CLI_ARGS_apply="-parallelism=6" USER root ## AWS cli -RUN apk add --no-cache \ - python3 \ - py3-pip \ - && pip3 install --upgrade pip \ - && pip3 install awscli \ - && rm -rf /var/cache/apk/* \ - && aws --version +RUN apk add --no-cache --force-broken-world \ + aws-cli && \ + rm -rf /var/cache/apk/* ## Azure cli -RUN apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo make python3 py3-pip \ - && pip3 install --upgrade pip \ - && pip3 install azure-cli \ - && rm -rf /var/cache/apk/* \ - && az --version +RUN apk add --no-cache --force-broken-world \ + python3 \ + py3-pip \ + gcc \ + musl-dev \ + python3-dev \ + libffi-dev \ + openssl-dev \ + cargo \ + make && \ + rm -rf /var/cache/apk/* && \ + pip3 install --upgrade --break-system-packages pip USER devops +RUN pip3 install --break-system-packages azure-cli + # Install the ibmcloud cli RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \ ibmcloud plugin install container-service -f && \ diff --git a/Containerfile-fedora b/Containerfile-fedora index 79b9496..982407b 100644 --- a/Containerfile-fedora +++ b/Containerfile-fedora @@ -8,23 +8,28 @@ ENV TF_CLI_ARGS_apply="-parallelism=6" USER root ## AWS cli -RUN apk add --no-cache \ - python3 \ - py3-pip \ - && pip3 install --upgrade pip \ - && pip3 install awscli \ - && rm -rf /var/cache/apk/* \ - && aws --version +RUN dnf install -y \ + awscli && \ + dnf clean all ## Azure cli -RUN apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo make python3 py3-pip \ - && pip3 install --upgrade pip \ - && pip3 install azure-cli \ - && rm -rf /var/cache/apk/* \ - && az --version +RUN dnf install -y \ + python3 \ + pip3 \ + gcc \ + musl-devel \ + python3-devel \ + libffi-devel \ + openssl-devel \ + cargo \ + make && \ + dnf clean all && \ + pip3 install --upgrade --break-system-packages pip USER devops +RUN pip3 install --break-system-packages azure-cli + # Install the ibmcloud cli RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \ ibmcloud plugin install container-service -f && \ From 2c0b07faad42437cd3d4da78a301c363f0d387c2 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Tue, 11 Mar 2025 09:50:20 -0500 Subject: [PATCH 3/5] Update ibmcloud install logic Signed-off-by: Sean Sundberg --- Containerfile-fedora | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Containerfile-fedora b/Containerfile-fedora index 982407b..f8e2b76 100644 --- a/Containerfile-fedora +++ b/Containerfile-fedora @@ -28,13 +28,20 @@ RUN dnf install -y \ USER devops +# Azure cli RUN pip3 install --break-system-packages azure-cli # Install the ibmcloud cli + +USER root + RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \ ibmcloud plugin install container-service -f && \ ibmcloud plugin install container-registry -f && \ ibmcloud plugin install observe-service -f && \ - ibmcloud plugin install vpc-infrastructure -f && \ - ibmcloud config --check-version=false && \ + ibmcloud plugin install vpc-infrastructure -f + +USER devops + +RUN ibmcloud config --check-version=false && \ chmod -R g=u ${HOME} From 04e31c9176a8f14c20f39908cada8643ff58b078 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Tue, 11 Mar 2025 10:03:33 -0500 Subject: [PATCH 4/5] Update fedora permissions Signed-off-by: Sean Sundberg --- Containerfile-fedora | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Containerfile-fedora b/Containerfile-fedora index f8e2b76..c2e8857 100644 --- a/Containerfile-fedora +++ b/Containerfile-fedora @@ -39,9 +39,9 @@ RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \ ibmcloud plugin install container-service -f && \ ibmcloud plugin install container-registry -f && \ ibmcloud plugin install observe-service -f && \ - ibmcloud plugin install vpc-infrastructure -f + ibmcloud plugin install vpc-infrastructure -f && \ + ibmcloud config --check-version=false && \ + chown -R devops ${HOME}/.bluemix && \ + chmod -R g=u ${HOME}/.bluemix USER devops - -RUN ibmcloud config --check-version=false && \ - chmod -R g=u ${HOME} From 9719f6d582552c3ba87859cc5c7dbcbef1b21e98 Mon Sep 17 00:00:00 2001 From: Sean Sundberg Date: Tue, 11 Mar 2025 11:20:19 -0500 Subject: [PATCH 5/5] Remove deprecated set-output calls in workflow Signed-off-by: Sean Sundberg --- .github/workflows/docker-build.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index e94e8d8..d32e028 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -87,25 +87,25 @@ jobs: fi echo "Short terraform: ${SHORT_TERRAFORM}" - echo "::set-output name=terraform::$SHORT_TERRAFORM" + echo "terraform=$SHORT_TERRAFORM" >> $GITHUB_OUTPUT echo "Short tag enabled: $SHORT_TAG_ENABLED" - echo "::set-output name=short-enabled::$SHORT_TAG_ENABLED" + echo "short-enabled=$SHORT_TAG_ENABLED" >> $GITHUB_OUTPUT echo "Release tag: ${RELEASE_TAG}" - echo "::set-output name=release-tag::$RELEASE_TAG" + echo "release-tag=$RELEASE_TAG" >> $GITHUB_OUTPUT echo "Release tag enabled: $RELEASE_TAG_ENABLED" - echo "::set-output name=release-tag-enabled::$RELEASE_TAG_ENABLED" + echo "release-tag-enabled=$RELEASE_TAG_ENABLED" >> $GITHUB_OUTPUT echo "Release tag short enabled: $RELEASE_TAG_SHORT_ENABLED" - echo "::set-output name=release-tag-short-enabled::$RELEASE_TAG_SHORT_ENABLED" + echo "release-tag-short-enabled=$RELEASE_TAG_SHORT_ENABLED" >> $GITHUB_OUTPUT echo "Base enabled: $BASE_ENABLED" - echo "::set-output name=base-enabled::$BASE_ENABLED" + echo "base-enabled=$BASE_ENABLED" >> $GITHUB_OUTPUT echo "Latest enabled: $LATEST_ENABLED" - echo "::set-output name=latest-enabled::$LATEST_ENABLED" + echo "latest-enabled=$LATEST_ENABLED" >> $GITHUB_OUTPUT - name: Docker CNTK meta ${{ matrix.base }}:${{ matrix.terraform }} id: cntk-meta