diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 0f054d6..a249ce8 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -27,3 +27,5 @@ jobs: env: PHP_VERSION: ${{ matrix.php }} STREAM: ${{ env.stream }} + with: + source: . diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 4898a5b..f99a5e0 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -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 @@ -68,4 +69,5 @@ jobs: PHP_VERSION: ${{ matrix.php }} STREAM: ${{ inputs.stream }} with: + source: . push: ${{ inputs.push }} diff --git a/base/Dockerfile b/base/Dockerfile index 03a51e6..acf32da 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -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 @@ -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} @@ -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 \ diff --git a/cli/Dockerfile b/cli/Dockerfile index abe3c0c..a4b6712 100644 --- a/cli/Dockerfile +++ b/cli/Dockerfile @@ -1,4 +1,4 @@ -ARG ALPINE_VERSION=3.21 +ARG ALPINE_VERSION=3.20 FROM alpine:${ALPINE_VERSION} AS redis-cli diff --git a/docker-bake.hcl b/docker-bake.hcl index 390bbec..24fc180 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -3,7 +3,7 @@ variable "PHP_VERSION" { } variable "ALPINE_VERSION" { - default = "3.21" + default = "3.20" } variable "STREAM" {