Fixed Composer installation and zip extension

68publishers · Jul 19, 2023 · f5b7f05 · f5b7f05
1 parent 3992cd3
commit f5b7f05
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
  matrix:
  platform:
  - linux/amd64
- - linux/arm64/v8
+ #- linux/arm64/v8
  steps:
  - uses: actions/checkout@v3
 

diff --git a/php/8.1-unit/Dockerfile b/php/8.1-unit/Dockerfile
@@ -22,8 +22,6 @@ RUN set -ex \
  $PHPIZE_DEPS \
  # iconv
  icu-dev \
- # zip
- libzip-dev \
  # nginx unit
  openssl-dev \
  musl-dev \
@@ -34,7 +32,6 @@ RUN set -ex \
  gnu-libiconv=~1.17 \
  harfbuzz-icu \
  # tools
- composer=~2.5.8 \
  git=~2.40 \
  jq=~1.6 \
  yarn=~1.22 \
@@ -46,6 +43,8 @@ RUN set -ex \
  libjpeg-turbo-dev \
  libwebp-dev \
  libpng-dev \
+ # zip
+ libzip-dev \
  # ampq
  rabbitmq-c-dev \
  # nginx unit
@@ -115,11 +114,13 @@ RUN set -ex \
  # Delete PHP build dependencies and cache/temp files
  && apk del .build-deps \
  && rm -rf \
- ~/.composer/cache/* \
  /tmp/pear \
  /tmp/no-pie-compile.specs \
  $UNITTMP
 
+# Install Composer
+COPY --from=composer:2.5.8 /usr/bin/composer /usr/bin/composer
+
 # PHP custom ini values
 COPY php-ini/common "$PHP_INI_DIR/conf.d/"