remove python2

fix docker alpine
ariaieboy · Apr 27, 2024 · f855e39 · f855e39
1 parent 0ca6794
commit f855e39
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-alpine.yml b/.github/workflows/build-alpine.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           platforms: linux/amd64,linux/arm64
           context: ./runtimes/common
-          file: ./runtimes/${{ matrix.php }}/Dockerfile
+          file: ./runtimes/${{ matrix.php }}/DockerfileAlpine
           push: true
           build-args: NODE_VERSION=${{ matrix.node }}
           tags: |

diff --git a/runtimes/8.1/Dockerfile b/runtimes/8.1/Dockerfile
@@ -15,7 +15,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update \
         && mkdir -p /etc/apt/keyrings \
-        && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch ffmpeg libheif-dev libavif-dev jpegoptim optipng pngquant gifsicle nano \
+        && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev  dnsutils librsvg2-bin fswatch ffmpeg libheif-dev libavif-dev jpegoptim optipng pngquant gifsicle nano \
         && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \
         && echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
     && apt-get update \

diff --git a/runtimes/8.2/Dockerfile b/runtimes/8.2/Dockerfile
@@ -15,7 +15,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update \
         && mkdir -p /etc/apt/keyrings \
-        && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch ffmpeg libheif-dev libavif-dev jpegoptim optipng pngquant gifsicle nano \
+        && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev  dnsutils librsvg2-bin fswatch ffmpeg libheif-dev libavif-dev jpegoptim optipng pngquant gifsicle nano \
         && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \
         && echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
     && apt-get update \

diff --git a/runtimes/8.3/Dockerfile b/runtimes/8.3/Dockerfile
@@ -15,7 +15,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN apt-get update \
         && mkdir -p /etc/apt/keyrings \
-        && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev python2 dnsutils librsvg2-bin fswatch ffmpeg libheif-dev libavif-dev jpegoptim optipng pngquant gifsicle nano \
+        && apt-get install -y gnupg gosu curl ca-certificates zip unzip git supervisor sqlite3 libcap2-bin libpng-dev  dnsutils librsvg2-bin fswatch ffmpeg libheif-dev libavif-dev jpegoptim optipng pngquant gifsicle nano \
         && curl -sS 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x14aa40ec0831756756d7f66c4f4ea0aae5267a6c' | gpg --dearmor | tee /usr/share/keyrings/ppa_ondrej_php.gpg > /dev/null \
         && echo "deb [signed-by=/usr/share/keyrings/ppa_ondrej_php.gpg] https://ppa.launchpadcontent.net/ondrej/php/ubuntu noble main" > /etc/apt/sources.list.d/ppa_ondrej_php.list \
     && apt-get update \