Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,5 @@ jobs:
env:
PHP_VERSION: ${{ matrix.php }}
STREAM: ${{ env.stream }}
with:
source: .
2 changes: 2 additions & 0 deletions .github/workflows/build-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
uses: actions/checkout@v6
with:
ref: ${{ inputs.branch }}
fetch-depth: 0

- name: 🔑 Login to Docker Hub
uses: docker/login-action@v3
Expand All @@ -68,4 +69,5 @@ jobs:
PHP_VERSION: ${{ matrix.php }}
STREAM: ${{ inputs.stream }}
with:
source: .
push: ${{ inputs.push }}
6 changes: 3 additions & 3 deletions base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ALPINE_VERSION=3.21
ARG ALPINE_VERSION=3.20
ARG PHP_VERSION=8.0

FROM docker.io/skpr/docconv:alpine${ALPINE_VERSION} AS docconv
Expand All @@ -7,7 +7,7 @@ FROM ghcr.io/skpr/compass-extension:v1.10.0-php${PHP_VERSION} AS compass
FROM from_image AS base

ARG TARGETARCH
ARG ALPINE_VERSION=3.21
ARG ALPINE_VERSION=3.20
ARG PHP_VERSION=8.0

ENV ALPINE_VERSION=${ALPINE_VERSION}
Expand All @@ -25,7 +25,7 @@ RUN mkdir /data && \
WORKDIR /data

RUN apk add --no-cache curl && \
curl -sSL "https://packages.skpr.io/php-alpine/${ALPINE_VERSION}/php${PHP_VERSION}/skpr-${TARGETARCH}.rsa.pub" -o /etc/apk/keys/skpr.rsa.pub && \
curl -sSL https://packages.skpr.io/php-alpine/skpr.rsa.pub -o /etc/apk/keys/skpr.rsa.pub && \
echo "https://packages.skpr.io/php-alpine/${ALPINE_VERSION}/php${PHP_VERSION}" >> /etc/apk/repositories

RUN apk --update --no-cache add \
Expand Down
2 changes: 1 addition & 1 deletion cli/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ALPINE_VERSION=3.21
ARG ALPINE_VERSION=3.20

FROM alpine:${ALPINE_VERSION} AS redis-cli

Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
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.20"
}

variable "STREAM" {
Expand Down
Loading