All: fix PHP binary [closes #55]

dockette · Sep 19, 2024 · a014108 · a014108
1 parent 206fed5
commit a014108
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/adminer-dg/Dockerfile b/adminer-dg/Dockerfile
@@ -12,15 +12,15 @@ RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/a
     apk update && \
     apk upgrade && \
     apk add \
-    wget \
-    ca-certificates \
-    php83@community \
-    php83-session@community \
-    php83-mysqli@community \
-    php83-pgsql@community \
-    php83-json@community \
-    php83-pecl-mongodb@community \
-    tini && \
+        wget \
+        ca-certificates \
+        php83@community \
+        php83-session@community \
+        php83-mysqli@community \
+        php83-pgsql@community \
+        php83-json@community \
+        php83-pecl-mongodb@community \
+        tini && \
     wget https://github.com/dg/adminer-custom/archive/v$ADMINER_DG_VERION.tar.gz -O /srv/adminer.tgz && \
     tar zxvf /srv/adminer.tgz --strip-components=1 -C /srv && \
     rm /srv/adminer.tgz && \

diff --git a/adminer-editor/Dockerfile b/adminer-editor/Dockerfile
@@ -14,14 +14,14 @@ RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/a
     apk add \
         wget \
         ca-certificates \
+        php83@community \
         php83-session@community \
         php83-mysqli@community \
         php83-pgsql@community \
         php83-json@community \
         php83-pecl-mongodb@community \
         tini && \
     wget https://github.com/vrana/adminer/releases/download/v$ADMINER_EDITOR_VERSION/editor-$ADMINER_EDITOR_VERSION.php -O /srv/index.php && \
-    ln -s /usr/bin/php83 /usr/bin/php && \
     apk del wget ca-certificates && \
     rm -rf /var/cache/apk/*
 

diff --git a/adminer-full/Dockerfile b/adminer-full/Dockerfile
@@ -14,14 +14,14 @@ RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/a
     apk add \
         wget \
         ca-certificates \
+        php83@community \
         php83-session@community \
         php83-mysqli@community \
         php83-pgsql@community \
         php83-json@community \
         php83-pecl-mongodb@community \
         tini && \
         wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
-    ln -s /usr/bin/php8 /usr/bin/php && \
     apk del wget ca-certificates && \
     rm -rf /var/cache/apk/*
 

diff --git a/adminer-mongo/Dockerfile b/adminer-mongo/Dockerfile
@@ -14,11 +14,11 @@ RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/a
     apk add \
         wget \
         ca-certificates \
+        php83@community \
         php83-session@community \
         php83-pecl-mongodb@community \
         tini && \
     wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
-    ln -s /usr/bin/php83 /usr/bin/php && \
     apk del wget ca-certificates && \
     rm -rf /var/cache/apk/*
 

diff --git a/adminer-mysql/Dockerfile b/adminer-mysql/Dockerfile
@@ -14,11 +14,11 @@ RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/a
     apk add \
         wget \
         ca-certificates \
+        php83@community \
         php83-session@community \
         php83-mysqli@community \
         tini && \
     wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
-    ln -s /usr/bin/php83 /usr/bin/php && \
     apk del wget ca-certificates && \
     rm -rf /var/cache/apk/*
 

diff --git a/adminer-postgres/Dockerfile b/adminer-postgres/Dockerfile
@@ -14,11 +14,11 @@ RUN echo '@community http://nl.alpinelinux.org/alpine/v3.20/community' >> /etc/a
     apk add \
         wget \
         ca-certificates \
+        php83@community \
         php83-session@community \
         php83-pgsql@community \
         tini && \
     wget https://github.com/vrana/adminer/releases/download/v$ADMINER_VERSION/adminer-$ADMINER_VERSION.php -O /srv/index.php && \
-    ln -s /usr/bin/php83 /usr/bin/php && \
     apk del wget ca-certificates && \
     rm -rf /var/cache/apk/*