Skip to content

chore: Switch to docker hardened images #107

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

Open
kimpepper wants to merge 6 commits into
base: main
Choose a base branch
from
Open

chore: Switch to docker hardened images #107

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
396140c
chore: Switch to docker hardened images
kimpepper Dec 18, 2025
f7d3b63
Login to dockerhub
kimpepper Dec 18, 2025
03342c4
Use secrets
kimpepper Dec 18, 2025
f3a39d5
Use registry
kimpepper Dec 18, 2025
b349003
Bump alpine version
kimpepper Dec 18, 2025
b944f50
Comment out docconv
kimpepper Dec 18, 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
7 changes: 7 additions & 0 deletions .github/workflows/build-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
registry: dhi.io
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: 🐋 Set up Docker Buildx
uses: docker/setup-buildx-action@v3

Expand Down
4 changes: 2 additions & 2 deletions base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG ALPINE_VERSION=3.21
ARG PHP_VERSION=8.0

FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv
#FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv
FROM ghcr.io/skpr/compass-extension:v1.10.0-php${PHP_VERSION} AS compass

FROM from_image AS base
Expand Down Expand Up @@ -85,7 +85,7 @@ COPY --from=compass /etc/php/conf.d/00_compass.ini /etc/php/conf.d/00_compass.in
COPY --from=compass /usr/lib/php/modules/compass.so /usr/lib/php/modules/compass.so

# Built using an updated build approach in this fork: https://github.com/skpr/docconv
COPY --from=docconv /usr/local/bin/docconv /usr/local/bin/docconv
#COPY --from=docconv /usr/local/bin/docconv /usr/local/bin/docconv

ADD conf.d/01_apcu.ini /etc/php/conf.d/01_apcu.ini
ADD conf.d/50_overrides.ini /etc/php/conf.d/50_overrides.ini
Expand Down
4 changes: 2 additions & 2 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ variable "PHP_VERSION" {
}

variable "ALPINE_VERSION" {
default = "3.21"
default = "3.22"
}

variable "STREAM" {
Expand Down Expand Up @@ -45,7 +45,7 @@ target "base" {
context = "base"

contexts = {
from_image = "docker-image://docker.io/alpine:${ALPINE_VERSION}"
from_image = "docker-image://dhi.io/alpine-base:${ALPINE_VERSION}"
}

args = {
Expand Down
Loading