Skip to content

feat: implement multi-stage Docker build for optimized layer reusability #24

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
fok666 merged 4 commits into from
Jan 19, 2026
Merged

feat: implement multi-stage Docker build for optimized layer reusability #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b76d40e
feat: implement multi-stage Docker build for optimized layer reusability
fok666 Jan 18, 2026
e921961
fix: correct helm binary path from /usr/bin to /usr/local/bin in full…
fok666 Jan 18, 2026
c1d9096
fix: optimize Dockerfile by cleaning up apt lists after installation
fok666 Jan 18, 2026
8b483d7
fix: address code review feedback - critical arch detection, finaliza…
fok666 Jan 18, 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
72 changes: 30 additions & 42 deletions .github/workflows/docker-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
workflow_dispatch:
inputs:
AGENT_VERSION:
description: 'Runner version (e.g., 2.321.0). Leave empty to use repository variable or Dockerfile default.'
description: 'Runner version (e.g., 17.9.0). Leave empty to use repository variable or Dockerfile default.'
required: false
type: string

Expand Down Expand Up @@ -46,7 +46,14 @@ jobs:
- name: Extract versions from Dockerfile
id: versions
run: |
AGENT_VERSION=$(grep '^ARG AGENT_VERSION=' Dockerfile | cut -d'=' -f2)
# Use workflow input if provided, else repository variable, else Dockerfile default
if [ -n "${{ inputs.AGENT_VERSION }}" ]; then
AGENT_VERSION="${{ inputs.AGENT_VERSION }}"
elif [ -n "${{ vars.AGENT_VERSION }}" ]; then
AGENT_VERSION="${{ vars.AGENT_VERSION }}"
else
AGENT_VERSION=$(grep '^ARG AGENT_VERSION=' Dockerfile | cut -d'=' -f2)
fi
OS_VERSION=$(grep '^FROM ubuntu:' Dockerfile | cut -d':' -f2)
echo "agent=${AGENT_VERSION}" >> $GITHUB_OUTPUT
echo "os=${OS_VERSION}" >> $GITHUB_OUTPUT
Expand All @@ -59,7 +66,6 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY_IMAGE }}
${{ env.GHCR_IMAGE }}
tags: |
type=raw,value=latest,enable={{is_default_branch}}
Expand All @@ -86,26 +92,14 @@ jobs:
context: .
platforms: ${{ matrix.platform }}
push: false
build-args: |
ADD_DOCKER=${{ matrix.profile.docker }}
ADD_AZURE_CLI=${{ matrix.profile.azure_cli }}
ADD_AWS_CLI=${{ matrix.profile.aws_cli }}
ADD_POWERSHELL=${{ matrix.profile.powershell }}
ADD_AZURE_PWSH_CLI=${{ matrix.profile.azure_pwsh }}
ADD_AWS_PWSH_CLI=${{ matrix.profile.aws_pwsh }}
ADD_KUBECTL=${{ matrix.profile.kubectl }}
ADD_KUBELOGIN=${{ matrix.profile.kubelogin }}
ADD_KUSTOMIZE=${{ matrix.profile.kustomize }}
ADD_HELM=${{ matrix.profile.helm }}
ADD_YQ=${{ matrix.profile.yq }}
ADD_JQ=${{ matrix.profile.jq }}
ADD_TERRAFORM=${{ matrix.profile.terraform }}
ADD_OPENTOFU=${{ matrix.profile.opentofu }}
ADD_TERRASPACE=${{ matrix.platform == 'linux/amd64' && matrix.profile.terraspace || 0 }}
ADD_SUDO=${{ matrix.profile.sudo }}
target: ${{ matrix.profile.name }}
tags: ${{ env.REGISTRY_IMAGE }}:test-${{ matrix.profile.name }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=${{ matrix.profile.name }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
cache-from: |
type=gha,scope=base-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
type=gha,scope=common-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
type=gha,scope=docker-tools-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
type=gha,scope=${{ matrix.profile.name }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
cache-to: type=gha,mode=max,scope=${{ matrix.profile.name }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
outputs: type=docker,dest=/tmp/image-${{ matrix.profile.name }}-${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}.tar

Expand All @@ -130,7 +124,6 @@ jobs:
matrix:
profile: ${{ github.event_name == 'pull_request' && fromJSON('["full"]') || fromJSON('["full", "minimal", "k8s", "iac", "iac-pwsh"]') }}
platform: ${{ github.event_name == 'pull_request' && fromJSON('["amd64", "arm64"]') || fromJSON('["amd64"]') }}

steps:
- name: Download artifact
uses: actions/download-artifact@v7
Expand Down Expand Up @@ -187,7 +180,6 @@ jobs:
matrix:
profile: ${{ github.event_name == 'pull_request' && fromJSON('["full"]') || fromJSON('["full", "minimal", "k8s", "iac", "iac-pwsh"]') }}
platform: ${{ github.event_name == 'pull_request' && fromJSON('["amd64", "arm64"]') || fromJSON('["amd64"]') }}

steps:
- name: Check out the repo
uses: actions/checkout@v6
Expand Down Expand Up @@ -314,14 +306,22 @@ jobs:
opentofu: 1
terraspace: 1
sudo: 1

steps:
- name: Check out the repo
uses: actions/checkout@v6

- name: Extract versions from Dockerfile
id: versions
run: |
AGENT_VERSION=$(grep '^ARG AGENT_VERSION=' Dockerfile | cut -d'=' -f2)
# Use workflow input if provided, else repository variable, else Dockerfile default
if [ -n "${{ inputs.AGENT_VERSION }}" ]; then
AGENT_VERSION="${{ inputs.AGENT_VERSION }}"
elif [ -n "${{ vars.AGENT_VERSION }}" ]; then
AGENT_VERSION="${{ vars.AGENT_VERSION }}"
else
AGENT_VERSION=$(grep '^ARG AGENT_VERSION=' Dockerfile | cut -d'=' -f2)
fi
OS_VERSION=$(grep '^FROM ubuntu:' Dockerfile | cut -d':' -f2)
echo "agent=${AGENT_VERSION}" >> $GITHUB_OUTPUT
echo "os=${OS_VERSION}" >> $GITHUB_OUTPUT
Expand All @@ -341,7 +341,6 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
${{ env.REGISTRY_IMAGE }}
${{ env.GHCR_IMAGE }}

- name: Get the date
Expand All @@ -360,28 +359,17 @@ jobs:
context: .
platforms: linux/${{ matrix.platform }}
push: true
target: ${{ matrix.profile.name }}
build-args: |
AGENT_VERSION=${{ steps.versions.outputs.agent }}
ADD_DOCKER=${{ matrix.profile.docker }}
ADD_AZURE_CLI=${{ matrix.profile.azure_cli }}
ADD_AWS_CLI=${{ matrix.profile.aws_cli }}
ADD_POWERSHELL=${{ matrix.profile.powershell }}
ADD_AZURE_PWSH_CLI=${{ matrix.profile.azure_pwsh }}
ADD_AWS_PWSH_CLI=${{ matrix.profile.aws_pwsh }}
ADD_KUBECTL=${{ matrix.profile.kubectl }}
ADD_KUBELOGIN=${{ matrix.profile.kubelogin }}
ADD_KUSTOMIZE=${{ matrix.profile.kustomize }}
ADD_HELM=${{ matrix.profile.helm }}
ADD_YQ=${{ matrix.profile.yq }}
ADD_JQ=${{ matrix.profile.jq }}
ADD_TERRAFORM=${{ matrix.profile.terraform }}
ADD_OPENTOFU=${{ matrix.profile.opentofu }}
ADD_TERRASPACE=${{ matrix.platform == 'amd64' && matrix.profile.terraspace || 0 }}
ADD_SUDO=${{ matrix.profile.sudo }}
tags: |
${{ env.GHCR_IMAGE }}:${{ steps.versions.outputs.agent }}-ubuntu${{ steps.versions.outputs.os }}-${{ matrix.profile.name }}-${{ steps.date.outputs.date }}-${{ matrix.platform }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=gha,scope=${{ matrix.profile.name }}-${{ matrix.platform }}
cache-from: |
type=gha,scope=base-${{ matrix.platform }}
type=gha,scope=common-${{ matrix.platform }}
type=gha,scope=docker-tools-${{ matrix.platform }}
type=gha,scope=${{ matrix.profile.name }}-${{ matrix.platform }}
cache-to: type=gha,mode=max,scope=${{ matrix.profile.name }}-${{ matrix.platform }}
sbom: true
provenance: true
Expand Down
Loading