fix: add missing curl

williarin · May 26, 2024 · 146a433 · 146a433
1 parent 2bb2f14
commit 146a433
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 17 deletions.
diff --git a/php/7.4/docker/scripts/install-packages.sh b/php/7.4/docker/scripts/install-packages.sh
@@ -3,6 +3,7 @@ set -ex
 
 apk --no-cache add \
     bash \
+    curl \
     zip unzip;
 
 apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.15/main add 'icu-libs==69.1-r1';

diff --git a/php/8.0/docker/scripts/install-packages.sh b/php/8.0/docker/scripts/install-packages.sh
@@ -3,6 +3,7 @@ set -ex
 
 apk --no-cache add \
     bash \
+    curl \
     zip unzip;
 
 apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main add 'icu-libs==71.1-r2';

diff --git a/php/8.1/Dockerfile b/php/8.1/Dockerfile
@@ -39,7 +39,7 @@ RUN /docker/scripts/install-dev-packages.sh \
 
 FROM base AS base-fpm
 
-RUN apk --no-cache add php81-fpm \
+RUN apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.19/community add php81-fpm \
     && mv /docker/www.conf /etc/php81/php-fpm.d/www.conf
 
 EXPOSE 9000

diff --git a/php/8.1/docker/scripts/install-dev-packages.sh b/php/8.1/docker/scripts/install-dev-packages.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 set -ex
 
-apk --no-cache add make git php81-pecl-xdebug
+apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.19/community add make git php81-pecl-xdebug
 
 sed -i 's/;zend_extension/zend_extension/' /etc/php81/conf.d/50_xdebug.ini
diff --git a/php/8.1/docker/scripts/install-packages.sh b/php/8.1/docker/scripts/install-packages.sh
@@ -2,11 +2,12 @@
 set -ex
 
 apk --no-cache \
-    --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/community \
-    --repository=https://dl-cdn.alpinelinux.org/alpine/v3.18/main \
+    --repository=https://dl-cdn.alpinelinux.org/alpine/v3.19/community \
+    --repository=https://dl-cdn.alpinelinux.org/alpine/v3.19/main \
     add \
     bash \
     zip unzip \
+    curl \
     icu-libs \
     libavif \
     php81 \

diff --git a/php/8.2/docker/scripts/install-packages.sh b/php/8.2/docker/scripts/install-packages.sh
@@ -1,14 +1,13 @@
 #!/bin/sh
 set -ex
 
-apk --no-cache \
-    --repository=https://dl-cdn.alpinelinux.org/alpine/v3.19/community \
-    --repository=https://dl-cdn.alpinelinux.org/alpine/v3.19/main \
-    add \
+apk --no-cache add \
     bash \
     zip unzip \
-    icu-libs \
+    curl \
     libavif \
+    icu-libs \
+    libsodium \
     php82 \
     php82-ctype \
     php82-curl \
@@ -39,3 +38,6 @@ apk --no-cache \
     php82-fileinfo \
     php82-sodium \
     php82-opcache
+
+rm -f /usr/bin/php
+ln -s /usr/bin/php82 /usr/bin/php
diff --git a/php/8.3/docker/scripts/install-dev-packages.sh b/php/8.3/docker/scripts/install-dev-packages.sh
@@ -2,6 +2,6 @@
 set -ex
 
 apk --no-cache add make git
-apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community add php83-pecl-xdebug
+apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/3.20/community add php83-pecl-xdebug
 
 sed -i 's/;zend_extension/zend_extension/' /etc/php83/conf.d/50_xdebug.ini
diff --git a/php/8.3/docker/scripts/install-packages.sh b/php/8.3/docker/scripts/install-packages.sh
@@ -4,13 +4,10 @@ set -ex
 apk --no-cache add \
     bash \
     zip unzip \
-
-apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main add libavif icu-libs libsodium
-
-apk --no-cache \
-    --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
-    --repository=https://dl-cdn.alpinelinux.org/alpine/edge/main \
-    add \
+    curl \
+    libavif \
+    icu-libs \
+    libsodium \
     php83 \
     php83-ctype \
     php83-curl \
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ set -ex @@
     apk --no-cache add \
         bash \
+        curl \
         zip unzip;
     apk --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.15/main add 'icu-libs==69.1-r1';
@@ Expand Down @@