Skip to content

Commit

Permalink
Merge pull request #108 from shopware/pin-php-extensions
Browse files Browse the repository at this point in the history
feat: pin 3rd party php extensions
  • Loading branch information
shyim authored Oct 11, 2024
2 parents 88c3c08 + eb0bb88 commit 2746ec5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ on:
schedule:
- cron: '10 4 * * *'

concurrency:
group: "${{ github.ref }}"
cancel-in-progress: true

env:
DOCKER_BUILDKIT: 1
COSIGN_EXPERIMENTAL: 1
Expand Down Expand Up @@ -167,7 +171,6 @@ jobs:
name: Test Image
runs-on: ubuntu-latest
needs: [caddy]
if: github.ref != 'refs/heads/main'
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand All @@ -177,7 +180,14 @@ jobs:
with:
repository: shopwareLabs/example-docker-repository

- name: Build
- name: Build main branch
if: github.ref == 'refs/heads/main'
run: docker compose build --build-arg BASE_IMAGE=ghcr.io/shopware/docker-base:8.3-caddy
env:
DOCKER_BUILDKIT: 0

- name: Build PR
if: github.ref != 'refs/heads/main'
run: docker compose build --build-arg BASE_IMAGE=ghcr.io/shopware/docker-base-ci-test:${{ github.run_id }}-8.3-caddy
env:
DOCKER_BUILDKIT: 0
Expand Down
2 changes: 1 addition & 1 deletion fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ADD https://github.com/mlocati/docker-php-extension-installer/releases/latest/do
RUN apk add --no-cache icu-data-full curl jq trurl && \
apk upgrade --no-cache && \
chmod +x /usr/local/bin/install-php-extensions && \
install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ffi redis-6.0.2 opcache apcu amqp zstd && \
install-php-extensions bcmath gd intl mysqli pdo_mysql pcntl sockets bz2 gmp soap zip ffi opcache redis-6.0.2 apcu-5.1.24 amqp-2.1.2 zstd-0.13.3 && \
mkdir -p /var/www/html && \
mv "${PHP_INI_DIR}/php.ini-production" "${PHP_INI_DIR}/php.ini" && \
rm -f /usr/local/etc/php-fpm.d/zz-docker.conf && \
Expand Down

0 comments on commit 2746ec5

Please sign in to comment.