Skip to content

Update workflow and container build logic #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seansund merged 1 commit into from
Mar 12, 2025
Merged

Update workflow and container build logic #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions .github/workflows/docker-build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -86,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
Expand Down
29 changes: 22 additions & 7 deletions Containerfile-alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
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.2-alpine

ARG TARGETPLATFORM

USER root

## Azure cli
RUN sudo apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo make python3 py3-pip openssh \
&& sudo pip3 install --upgrade pip \
&& sudo pip3 install azure-cli \
&& sudo 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 && \
pip3 install --break-system-packages azure-cli

USER devops

RUN az --version

28 changes: 21 additions & 7 deletions Containerfile-fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
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.2-fedora

ARG TARGETPLATFORM

USER root

## 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 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 && \
pip3 install --break-system-packages azure-cli

USER devops

RUN az --version