Skip to content

Dockerfile improvement #114

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

Closed
WolfangAukang wants to merge 9 commits into from
Closed

Dockerfile improvement #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
76b3c5b
simplerisk-minimal: refactor Dockerfile
WolfangAukang May 12, 2025
2f7f49c
simplerisk-minimal: perform some hadolint fixes
WolfangAukang May 15, 2025
cdc7e6e
ci: fix build-args references
WolfangAukang May 16, 2025
ac845c2
ci: fix description
WolfangAukang May 16, 2025
339a53f
simplerisk: refactor Dockerfile
WolfangAukang May 16, 2025
3981efb
simplerisk-minimal: format
WolfangAukang May 16, 2025
fe3a226
flake: update, add hadolint
WolfangAukang May 16, 2025
6a813a2
simplerisk: perform some hadolint fixes
WolfangAukang May 16, 2025
ec312a3
simplerisk: fix missing dependencies
WolfangAukang May 16, 2025
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
16 changes: 10 additions & 6 deletions .github/workflows/container-validation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,33 @@ jobs:
uses: ./.github/workflows/verify-image_rw.yml
with:
context_path: "simplerisk/"
dockerfile_path: "simplerisk/jammy/Dockerfile"
dockerfile_path: "simplerisk/Dockerfile"
image_tag: "simplerisk/simplerisk:testing"
build_args: "ubuntu_version_code=jammy"

simplerisk-noble:
name: 'Verify simplerisk/simplerisk image based on Ubuntu 24.04 (Noble)'
uses: ./.github/workflows/verify-image_rw.yml
with:
context_path: "simplerisk/"
dockerfile_path: "simplerisk/noble/Dockerfile"
dockerfile_path: "simplerisk/Dockerfile"
image_tag: "simplerisk/simplerisk:testing"
build_args: "ubuntu_version_code=noble"

simplerisk-minimal-php81:
name: 'Verify simplerisk/simplerisk image based on PHP 8.1 with Apache'
name: 'Verify simplerisk/simplerisk-minimal image based on PHP 8.1 with Apache'
uses: ./.github/workflows/verify-image_rw.yml
with:
context_path: "simplerisk-minimal/"
dockerfile_path: "simplerisk-minimal/php81/Dockerfile"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_tag: "simplerisk/simplerisk-minimal:testing"
build_args: "php_version=8.1"

simplerisk-minimal-php83:
name: 'Verify simplerisk/simplerisk image based on PHP 8.3 with Apache'
name: 'Verify simplerisk/simplerisk-minimal image based on PHP 8.3 with Apache'
uses: ./.github/workflows/verify-image_rw.yml
with:
context_path: "simplerisk-minimal/"
dockerfile_path: "simplerisk-minimal/php83/Dockerfile"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_tag: "simplerisk/simplerisk-minimal:testing"
build_args: "php_version=8.3"
12 changes: 8 additions & 4 deletions .github/workflows/push-to-dockerhub.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,44 @@ jobs:
uses: ./.github/workflows/push-to-dockerhub_rw.yml
with:
context_path: "simplerisk"
dockerfile_path: "simplerisk/jammy/Dockerfile"
dockerfile_path: "simplerisk/Dockerfile"
image_name: "simplerisk/simplerisk"
version: "20250411-001"
os_version: "jammy"
build_args: "ubuntu_version_code=jammy"
secrets: inherit
simplerisk-noble:
name: 'Push simplerisk/simplerisk image based on Ubuntu 24.04 (Noble)'
uses: ./.github/workflows/push-to-dockerhub_rw.yml
with:
context_path: "simplerisk"
dockerfile_path: "simplerisk/noble/Dockerfile"
dockerfile_path: "simplerisk/Dockerfile"
image_name: "simplerisk/simplerisk"
version: "20250411-001"
os_version: "noble"
main_image: true
build_args: "ubuntu_version_code=noble"
secrets: inherit
simplerisk-minimal-php81:
name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.1 with Apache'
uses: ./.github/workflows/push-to-dockerhub_rw.yml
with:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/php81/Dockerfile"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_name: "simplerisk/simplerisk-minimal"
version: "20250411-001"
os_version: "php81"
build_args: "php_version=8.1"
secrets: inherit
simplerisk-minimal-php83:
name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.3 with Apache'
uses: ./.github/workflows/push-to-dockerhub_rw.yml
with:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/php83/Dockerfile"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_name: "simplerisk/simplerisk-minimal"
version: "20250411-001"
os_version: "php83"
main_image: true
build_args: "php_version=8.3"
secrets: inherit
5 changes: 5 additions & 0 deletions .github/workflows/push-to-dockerhub_rw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ on:
description: Is this the latest image?
default: false
type: boolean
build_args:
description: Arguments to use on image at runtime
type: string
secrets:
DOCKER_USERNAME:
required: true
Expand Down Expand Up @@ -60,6 +63,7 @@ jobs:
context: ${{ inputs.context_path }}
file: ${{ inputs.dockerfile_path }}
push: ${{ github.event_name != 'pull_request' }}
build-args: ${{ inputs.build_args || '' }}
tags: |
${{ inputs.image_name }}
${{ inputs.image_name }}:${{ inputs.version }}
Expand All @@ -72,6 +76,7 @@ jobs:
context: ${{ inputs.context_path }}
file: ${{ inputs.dockerfile_path }}
push: ${{ github.event_name != 'pull_request' }}
build-args: ${{ inputs.build_args || '' }}
tags: |
${{ inputs.image_name }}:${{ inputs.version }}-${{ inputs.os_version }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/push-to-gh-pkgs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,40 +18,44 @@ jobs:
uses: ./.github/workflows/push-to-gh-pkgs_rw.yml
with:
context_path: "simplerisk"
dockerfile_path: "simplerisk/jammy/Dockerfile"
dockerfile_path: "simplerisk/Dockerfile"
image_name: "simplerisk"
version: "20250411-001"
os_version: "jammy"
build_args: "ubuntu_version_code=jammy"
secrets: inherit
simplerisk-noble:
name: 'Push simplerisk/simplerisk image based on Ubuntu 24.04 (Noble)'
uses: ./.github/workflows/push-to-gh-pkgs_rw.yml
with:
context_path: "simplerisk"
dockerfile_path: "simplerisk/noble/Dockerfile"
dockerfile_path: "simplerisk/Dockerfile"
image_name: "simplerisk"
version: "20250411-001"
os_version: "noble"
main_image: true
build_args: "ubuntu_version_code=noble"
secrets: inherit
simplerisk-minimal-php81:
name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.1 with Apache'
uses: ./.github/workflows/push-to-gh-pkgs_rw.yml
with:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/php81/Dockerfile"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_name: "simplerisk-minimal"
version: "20250411-001"
os_version: "php81"
build_args: "php_version=8.1"
secrets: inherit
simplerisk-minimal-php83:
name: 'Push simplerisk/simplerisk-minimal image based on PHP 8.3 with Apache'
uses: ./.github/workflows/push-to-gh-pkgs_rw.yml
with:
context_path: "simplerisk-minimal"
dockerfile_path: "simplerisk-minimal/php83/Dockerfile"
dockerfile_path: "simplerisk-minimal/Dockerfile"
image_name: "simplerisk-minimal"
version: "20250411-001"
os_version: "php83"
main_image: true
build_args: "php_version=8.3"
secrets: inherit
4 changes: 4 additions & 0 deletions .github/workflows/push-to-gh-pkgs_rw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ on:
main_image:
default: false
type: boolean
build_args:
type: string

env:
# Use docker.io for Docker Hub if empty
Expand Down Expand Up @@ -73,6 +75,7 @@ jobs:
context: ${{ inputs.context_path }}
file: ${{ inputs.dockerfile_path }}
push: ${{ github.event_name != 'pull_request' }}
build-args: ${{ inputs.build_args || '' }}
tags: |
ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}
ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}:${{ inputs.version }}
Expand All @@ -98,6 +101,7 @@ jobs:
context: ${{ inputs.context_path }}
file: ${{ inputs.dockerfile_path }}
push: ${{ github.event_name != 'pull_request' }}
build-args: ${{ inputs.build_args || '' }}
tags: |
ghcr.io/${{ github.repository_owner }}/${{ inputs.image_name }}:${{ inputs.version }}-${{ inputs.os_version }}
labels: ${{ steps.meta.outputs.labels }}
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/verify-image_rw.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ on:
image_tag:
required: true
type: string
build_args:
type: string

jobs:
verify_image:
Expand All @@ -25,6 +27,7 @@ jobs:
context: ${{ inputs.context_path }}
file: ${{ inputs.dockerfile_path }}
tags: ${{ inputs.image_tag }}
build-args: ${{ inputs.build_args || '' }}
- name: Run linter with Dockle
uses: erzz/dockle-action@v1
with:
Expand Down
Loading