Skip to content

feat(ci): isolate Azure flavor builds and standardize CST test tags #3060

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
ChristophShyper merged 6 commits into from
Jul 7, 2026
Merged

feat(ci): isolate Azure flavor builds and standardize CST test tags #3060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c29fc07
fix(ci): isolate Azure flavor builds and standardize CST test tags
ChristophShyper Jun 24, 2026
cd05443
fix: pass AZ_VERSION in proper order
ChristophShyper Jun 24, 2026
a89ba6c
fix: make default alpine packages install
ChristophShyper Jun 24, 2026
2ebd812
fix: refresh docker-terragrunt dependencies and test matrix
ChristophShyper Jul 7, 2026
fca4534
Merge branch 'master' into dependency/alpine-3-24-1
ChristophShyper Jul 7, 2026
b4280fa
chore: small improvements and cleanup
ChristophShyper Jul 7, 2026
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
1 change: 1 addition & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

# Include
!Dockerfile
!Dockerfile.azure
!LICENSE
!README.md
!alpine-packages.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ updates:
target-branch: master
schedule:
interval: weekly
day: monday
day: wednesday
time: "05:00"
timezone: "UTC"
assignees:
Expand All @@ -20,7 +20,7 @@ updates:
target-branch: master
schedule:
interval: weekly
day: monday
day: wednesday
time: "05:00"
timezone: "UTC"
assignees:
Expand All @@ -35,7 +35,7 @@ updates:
target-branch: master
schedule:
interval: weekly
day: monday
day: wednesday
time: "05:00"
timezone: "UTC"
assignees:
Expand All @@ -58,7 +58,7 @@ updates:
target-branch: master
schedule:
interval: weekly
day: monday
day: wednesday
time: "05:00"
timezone: "UTC"
assignees:
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/auto-pull-request-create.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@ jobs:

build-and-push:
name: Build and push
runs-on: ubuntu-24.04
runs-on: ubuntu-24.04-arm
timeout-minutes: 90
needs: [pull-request, lint]
env:
VERSION_PREFIX: test-
VERSION_SUFFIX: -test
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
SOPS_VERSION=$(sed -nE 's/^ARG SOPS_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AWS_VERSION=$(sed -nE 's/^aws-cli~=([0-9]+\.[0-9]+)$/\1/p' alpine-packages-aws.txt | head -1)
GCP_VERSION=$(sed -nE 's/^ARG GCP_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AZ_VERSION=$(sed -nE 's/^ARG AZ_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AZ_VERSION=$(sed -nE 's/^ARG AZ_VERSION=([0-9.]+)$/\1/p' Dockerfile.azure | head -1)
{
echo "TF_VERSION=${TF_VERSION}"
echo "OT_VERSION=${OT_VERSION}"
Expand Down Expand Up @@ -146,35 +146,35 @@ jobs:
done
}
sleep 5
pull_with_retry "${GHCR_IMAGE}:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-tf-${TF_VERSION}-tg-${TG_VERSION}"
pull_with_retry "${GHCR_IMAGE}:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-ot-${OT_VERSION}-tg-${TG_VERSION}"
pull_with_retry "${DOCKER_IMAGE}:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-tf-${TF_VERSION}-tg-${TG_VERSION}"
pull_with_retry "${DOCKER_IMAGE}:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-ot-${OT_VERSION}-tg-${TG_VERSION}"
pull_with_retry "${GHCR_IMAGE}:${{ matrix.flavor }}-tf-${TF_VERSION}-tg-${TG_VERSION}${{ env.VERSION_SUFFIX }}"
pull_with_retry "${GHCR_IMAGE}:${{ matrix.flavor }}-ot-${OT_VERSION}-tg-${TG_VERSION}${{ env.VERSION_SUFFIX }}"
pull_with_retry "${DOCKER_IMAGE}:${{ matrix.flavor }}-tf-${TF_VERSION}-tg-${TG_VERSION}${{ env.VERSION_SUFFIX }}"
pull_with_retry "${DOCKER_IMAGE}:${{ matrix.flavor }}-ot-${OT_VERSION}-tg-${TG_VERSION}${{ env.VERSION_SUFFIX }}"

- name: Cont.Struc.Test - ${{ matrix.flavor }} (TF image)
uses: devops-infra/action-container-structure-test@v1
with:
image: >-
devopsinfra/docker-terragrunt:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-tf-${{ env.TF_VERSION }}-tg-${{ env.TG_VERSION }}
devopsinfra/docker-terragrunt:${{ matrix.flavor }}-tf-${{ env.TF_VERSION }}-tg-${{ env.TG_VERSION }}${{ env.VERSION_SUFFIX }}
config: tests/${{ matrix.flavor }}.yml

- name: Cont.Struc.Test - ${{ matrix.flavor }} (OT image)
uses: devops-infra/action-container-structure-test@v1
with:
image: >-
devopsinfra/docker-terragrunt:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-ot-${{ env.OT_VERSION }}-tg-${{ env.TG_VERSION }}
devopsinfra/docker-terragrunt:${{ matrix.flavor }}-ot-${{ env.OT_VERSION }}-tg-${{ env.TG_VERSION }}${{ env.VERSION_SUFFIX }}
config: tests/${{ matrix.flavor }}.yml

- name: Cont.Struc.Test - Terraform
uses: devops-infra/action-container-structure-test@v1
with:
image: >-
devopsinfra/docker-terragrunt:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-tf-${{ env.TF_VERSION }}-tg-${{ env.TG_VERSION }}
devopsinfra/docker-terragrunt:${{ matrix.flavor }}-tf-${{ env.TF_VERSION }}-tg-${{ env.TG_VERSION }}${{ env.VERSION_SUFFIX }}
config: tests/tf.yml

- name: Cont.Struc.Test - OpenTofu
uses: devops-infra/action-container-structure-test@v1
with:
image: >-
devopsinfra/docker-terragrunt:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-ot-${{ env.OT_VERSION }}-tg-${{ env.TG_VERSION }}
devopsinfra/docker-terragrunt:${{ matrix.flavor }}-ot-${{ env.OT_VERSION }}-tg-${{ env.TG_VERSION }}${{ env.VERSION_SUFFIX }}
config: tests/ot.yml
24 changes: 12 additions & 12 deletions .github/workflows/cron-dependency-update.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: (C) Dependency Update

on:
schedule:
- cron: 0 6 * * 1
- cron: 0 5 * * 1
workflow_dispatch:

permissions:
Expand Down Expand Up @@ -61,11 +61,11 @@ jobs:

build-and-push:
name: Build and push
runs-on: ubuntu-24.04
runs-on: ubuntu-24.04-arm
timeout-minutes: 90
needs: [check]
env:
VERSION_PREFIX: test-
VERSION_SUFFIX: -test
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
SOPS_VERSION=$(sed -nE 's/^ARG SOPS_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AWS_VERSION=$(sed -nE 's/^aws-cli~=([0-9]+\.[0-9]+)$/\1/p' alpine-packages-aws.txt | head -1)
GCP_VERSION=$(sed -nE 's/^ARG GCP_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AZ_VERSION=$(sed -nE 's/^ARG AZ_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AZ_VERSION=$(sed -nE 's/^ARG AZ_VERSION=([0-9.]+)$/\1/p' Dockerfile.azure | head -1)
{
echo "TF_VERSION=${TF_VERSION}"
echo "OT_VERSION=${OT_VERSION}"
Expand Down Expand Up @@ -146,35 +146,35 @@ jobs:
done
}
sleep 5
pull_with_retry "${GHCR_IMAGE}:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-tf-${TF_VERSION}-tg-${TG_VERSION}"
pull_with_retry "${GHCR_IMAGE}:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-ot-${OT_VERSION}-tg-${TG_VERSION}"
pull_with_retry "${DOCKER_IMAGE}:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-tf-${TF_VERSION}-tg-${TG_VERSION}"
pull_with_retry "${DOCKER_IMAGE}:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-ot-${OT_VERSION}-tg-${TG_VERSION}"
pull_with_retry "${GHCR_IMAGE}:${{ matrix.flavor }}-tf-${TF_VERSION}-tg-${TG_VERSION}${{ env.VERSION_SUFFIX }}"
pull_with_retry "${GHCR_IMAGE}:${{ matrix.flavor }}-ot-${OT_VERSION}-tg-${TG_VERSION}${{ env.VERSION_SUFFIX }}"
pull_with_retry "${DOCKER_IMAGE}:${{ matrix.flavor }}-tf-${TF_VERSION}-tg-${TG_VERSION}${{ env.VERSION_SUFFIX }}"
pull_with_retry "${DOCKER_IMAGE}:${{ matrix.flavor }}-ot-${OT_VERSION}-tg-${TG_VERSION}${{ env.VERSION_SUFFIX }}"

- name: Cont.Struc.Test - ${{ matrix.flavor }} (TF image)
uses: devops-infra/action-container-structure-test@v1
with:
image: >-
devopsinfra/docker-terragrunt:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-tf-${{ env.TF_VERSION }}-tg-${{ env.TG_VERSION }}
devopsinfra/docker-terragrunt:${{ matrix.flavor }}-tf-${{ env.TF_VERSION }}-tg-${{ env.TG_VERSION }}${{ env.VERSION_SUFFIX }}
config: tests/${{ matrix.flavor }}.yml

- name: Cont.Struc.Test - ${{ matrix.flavor }} (OT image)
uses: devops-infra/action-container-structure-test@v1
with:
image: >-
devopsinfra/docker-terragrunt:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-ot-${{ env.OT_VERSION }}-tg-${{ env.TG_VERSION }}
devopsinfra/docker-terragrunt:${{ matrix.flavor }}-ot-${{ env.OT_VERSION }}-tg-${{ env.TG_VERSION }}${{ env.VERSION_SUFFIX }}
config: tests/${{ matrix.flavor }}.yml

- name: Cont.Struc.Test - Terraform
uses: devops-infra/action-container-structure-test@v1
with:
image: >-
devopsinfra/docker-terragrunt:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-tf-${{ env.TF_VERSION }}-tg-${{ env.TG_VERSION }}
devopsinfra/docker-terragrunt:${{ matrix.flavor }}-tf-${{ env.TF_VERSION }}-tg-${{ env.TG_VERSION }}${{ env.VERSION_SUFFIX }}
config: tests/tf.yml

- name: Cont.Struc.Test - OpenTofu
uses: devops-infra/action-container-structure-test@v1
with:
image: >-
devopsinfra/docker-terragrunt:${{ env.VERSION_PREFIX }}${{ matrix.flavor }}-ot-${{ env.OT_VERSION }}-tg-${{ env.TG_VERSION }}
devopsinfra/docker-terragrunt:${{ matrix.flavor }}-ot-${{ env.OT_VERSION }}-tg-${{ env.TG_VERSION }}${{ env.VERSION_SUFFIX }}
config: tests/ot.yml
8 changes: 4 additions & 4 deletions .github/workflows/manual-release-create.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
build-and-push:
name: Build & push
if: ${{ !inputs.build-and-push-only }}
runs-on: ubuntu-24.04
runs-on: ubuntu-24.04-arm
timeout-minutes: 90
needs: [lint, prepare]
strategy:
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
SOPS_VERSION=$(sed -nE 's/^ARG SOPS_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AWS_VERSION=$(sed -nE 's/^aws-cli~=([0-9]+\.[0-9]+)$/\1/p' alpine-packages-aws.txt | head -1)
GCP_VERSION=$(sed -nE 's/^ARG GCP_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AZ_VERSION=$(sed -nE 's/^ARG AZ_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AZ_VERSION=$(sed -nE 's/^ARG AZ_VERSION=([0-9.]+)$/\1/p' Dockerfile.azure | head -1)
{
echo "TF_VERSION=${TF_VERSION}"
echo "OT_VERSION=${OT_VERSION}"
Expand Down Expand Up @@ -193,7 +193,7 @@ jobs:
build-and-push-only:
name: Build & push only
if: ${{ inputs.build-and-push-only }}
runs-on: ubuntu-24.04
runs-on: ubuntu-24.04-arm
timeout-minutes: 90
strategy:
fail-fast: false
Expand Down Expand Up @@ -249,7 +249,7 @@ jobs:
SOPS_VERSION=$(sed -nE 's/^ARG SOPS_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AWS_VERSION=$(sed -nE 's/^aws-cli~=([0-9]+\.[0-9]+)$/\1/p' alpine-packages-aws.txt | head -1)
GCP_VERSION=$(sed -nE 's/^ARG GCP_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AZ_VERSION=$(sed -nE 's/^ARG AZ_VERSION=([0-9.]+)$/\1/p' Dockerfile | head -1)
AZ_VERSION=$(sed -nE 's/^ARG AZ_VERSION=([0-9.]+)$/\1/p' Dockerfile.azure | head -1)
{
echo "TF_VERSION=${TF_VERSION}"
echo "OT_VERSION=${OT_VERSION}"
Expand Down
16 changes: 1 addition & 15 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,11 @@ ARG SLIM=no
ARG TF=yes
ARG OT=no
ARG TG=yes
ARG AZURE=no
ARG AWS=no
ARG GCP=no
ARG YC=no

# Versions of dependencies
ARG GCP_VERSION=575.0.0
ARG AZ_VERSION=2.87.0
ARG TF_VERSION=1.15.7
ARG OT_VERSION=1.12.3
ARG TG_VERSION=1.1.0
Expand Down Expand Up @@ -47,7 +44,6 @@ RUN targetarch="${TARGETARCH:-}"; \
echo "TARGETARCH=${targetarch}"; \
echo "AWS=${AWS}"; \
echo "GCP=${GCP} GCP_VERSION=${GCP_VERSION}"; \
echo "AZURE=${AZURE} AZ_VERSION=${AZ_VERSION}"; \
echo "TF=${TF} TF_VERSION=${TF_VERSION}"; \
echo "OT=${OT} OT_VERSION=${OT_VERSION}"; \
echo "TG=${TG} TG_VERSION=${TG_VERSION}"; \
Expand All @@ -65,6 +61,7 @@ RUN xargs -r apk add --no-cache < /tmp/alpine-packages.txt; \
pip3 install --no-cache-dir -r /tmp/pip_common_requirements.txt; \
ln -sf /usr/bin/python3 /usr/bin/python; \
ln -sf /usr/bin/pip3 /usr/bin/pip; \
ln -sf /usr/bin/go-task /usr/bin/task; \
fi

# Install Terraform/OpenTofu/Terragrunt
Expand Down Expand Up @@ -181,16 +178,6 @@ RUN if [ "${GCP}" = "yes" ]; then \
gcloud config set metrics/environment github_docker_image; \
fi

SHELL ["/bin/ash", "-euxo", "pipefail", "-c"]
RUN if [ "${AZURE}" = "yes" ]; then \
if [ "${SLIM}" = "yes" ]; then \
echo "Azure flavor requires non-slim dependencies"; \
exit 1; \
fi; \
pip3 install --no-cache-dir "azure-cli==${AZ_VERSION}"; \
test "$(az version --output json | jq -r '."azure-cli"')" = "${AZ_VERSION}"; \
fi

COPY fmt/format-hcl fmt/fmt.sh fmt/terragrunt-fmt.sh entrypoint.sh /usr/bin/
SHELL ["/bin/ash", "-euxo", "pipefail", "-c"]
RUN chmod +x \
Expand All @@ -205,7 +192,6 @@ RUN chmod +x \
hcledit version >/dev/null 2>&1 || true; \
sops --version >/dev/null 2>&1 || true; \
aws --version >/dev/null 2>&1 || true; \
az --version >/dev/null 2>&1 || true; \
gcloud --version >/dev/null 2>&1 || true; \
rm -rf /var/cache/*; \
rm -rf /root/.cache/*; \
Expand Down
Loading