rename php7.1 packages

piwik/Dockerfile

@@ -22,24 +22,24 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r
     su-exec \
     geoip \
     tzdata \
-    php7.1-fpm@testing \
-    php7.1-gd@testing \
-    php7.1-curl@testing \
-    php7.1-session@testing \
-    php7.1-json@testing \
-    php7.1-ctype@testing \
-    php7.1-mbstring@testing \
-    php7.1-iconv@testing \
-    php7.1-zlib@testing \
-    php7.1-dom@testing \
-    php7.1-openssl@testing \
-    php7.1-mysqli@testing \
-    php7.1-pdo_mysql@testing \
-    php7.1-dev@testing \
-    php7.1-pear@testing \
+    php7-fpm@testing \
+    php7-gd@testing \
+    php7-curl@testing \
+    php7-session@testing \
+    php7-json@testing \
+    php7-ctype@testing \
+    php7-mbstring@testing \
+    php7-iconv@testing \
+    php7-zlib@testing \
+    php7-dom@testing \
+    php7-openssl@testing \
+    php7-mysqli@testing \
+    php7-pdo_mysql@testing \
+    php7-dev@testing \
+    php7-pear@testing \
  && sed -i "$ s|\-n||g" /usr/bin/pecl && pecl install geoip-1.1.1 \
- && echo 'extension=geoip.so' >> /etc/php7.1/conf.d/00_geoip.ini \
- && echo 'geoip.custom_directory=/piwik/misc' >> /etc/php7.1/php.ini \
+ && echo 'extension=geoip.so' >> /etc/php7/conf.d/00_geoip.ini \
+ && echo 'geoip.custom_directory=/piwik/misc' >> /etc/php7/php.ini \
  && mkdir /piwik && cd /tmp \
  && PIWIK_TARBALL="piwik-${VERSION}.tar.gz" \
  && wget -q https://builds.piwik.org/${PIWIK_TARBALL} \
@@ -56,11 +56,11 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r
  && wget -q https://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz -P /piwik/misc \
  && gzip -d /piwik/misc/GeoLiteCity.dat.gz \
  && mv /piwik/misc/GeoLiteCity.dat /piwik/misc/GeoIPCity.dat \
- && apk del ${BUILD_DEPS} php7.1-dev php7.1-pear \
+ && apk del ${BUILD_DEPS} php7-dev php7-pear \
  && rm -rf /var/cache/apk/* /tmp/* /root/.gnupg
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7.1/php-fpm.conf
+COPY php-fpm.conf /etc/php7/php-fpm.conf
 COPY s6.d /etc/s6.d
 COPY run.sh /usr/local/bin/run.sh
 

piwik/run.sh

@@ -6,5 +6,5 @@ fi
 
 ln -s /config/config.ini.php /piwik/config/config.ini.php
 mv piwik fix && mv fix piwik # fix strange bug
-chown -R $UID:$GID /piwik /config /var/log /etc/nginx /etc/php7.1 /var/lib/nginx /tmp /etc/s6.d
+chown -R $UID:$GID /piwik /config /var/log /etc/nginx /etc/php7 /var/lib/nginx /tmp /etc/s6.d
 exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d

piwik/s6.d/php/run

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec php-fpm7.1
+exec php-fpm7

privatebin/Dockerfile

@@ -9,11 +9,11 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r
     nginx \
     s6 \
     su-exec \
-    php7.1-fpm@testing \
-    php7.1-gd@testing \
-    php7.1-mcrypt@testing \
-    php7.1-json@testing \
-    php7.1-zlib@testing \
+    php7-fpm@testing \
+    php7-gd@testing \
+    php7-mcrypt@testing \
+    php7-json@testing \
+    php7-zlib@testing \
  && mkdir zerobin && cd zerobin \
  && wget -qO- https://github.com/PrivateBin/PrivateBin/archive/master.tar.gz | tar xz --strip 1 \
  && mv cfg/conf.ini.sample cfg/conf.ini \
@@ -21,7 +21,7 @@ RUN echo "@testing https://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/r
  && rm -f /var/cache/apk/*
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY php-fpm.conf /etc/php7.1/php-fpm.conf
+COPY php-fpm.conf /etc/php7/php-fpm.conf
 COPY run.sh /usr/local/bin/run.sh
 COPY s6.d /etc/s6.d
 

privatebin/run.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
-chown -R $UID:$GID /zerobin /etc/nginx /etc/php7.1 /var/log /var/lib/nginx /tmp /etc/s6.d
+chown -R $UID:$GID /zerobin /etc/nginx /etc/php7 /var/log /var/lib/nginx /tmp /etc/s6.d
 exec su-exec $UID:$GID /bin/s6-svscan /etc/s6.d

privatebin/s6.d/php/run

@@ -1,2 +1,2 @@
 #!/bin/sh
-exec php-fpm7.1
+exec php-fpm7