Merge #286 - cleanup after review for #56

williamdes · williamdes · commit d826f3a7218f · 2020-05-07T08:30:07.000+02:00
Partial revert of 6b63869 Signed-off-by: William Desportes <williamdes@wdes.fr>
diff --git a/.travis.yml b/.travis.yml
@@ -29,7 +29,7 @@ _helpers:
   stage: "Run tests in testing container"
   script:
     # Build image
-    - docker build --build-arg VCS_REF=`git rev-parse HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t phpmyadmin/phpmyadmin apache
+    - docker build -t phpmyadmin/phpmyadmin apache
     # Test for single database
     - docker run --name testadmin -d --link db_server:db -p 9090:80 phpmyadmin/phpmyadmin
     - ./testing/test-docker.sh testadmin 9090
@@ -71,20 +71,20 @@ jobs:
       name: "Apache amd64"
       arch: amd64
       script:
-      - docker build --build-arg VCS_REF=`git rev-parse HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t phpmyadmin/phpmyadmin apache
+      - docker build -t phpmyadmin/phpmyadmin apache
     - <<: *build-image
       name: "fpm amd64"
       arch: amd64
       script:
-      - docker build --build-arg VCS_REF=`git rev-parse HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t phpmyadmin/phpmyadmin fpm
+      - docker build -t phpmyadmin/phpmyadmin fpm
     - <<: *build-image
       name: "fpm-alpine amd64"
       arch: amd64
       script:
-      - docker build --build-arg VCS_REF=`git rev-parse HEAD` --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` -t phpmyadmin/phpmyadmin fpm-alpine
+      - docker build -t phpmyadmin/phpmyadmin fpm-alpine
     - <<: *test-apache-image
       name: "Run testing for MariaDB"
       env: DB=mariadb:latest
     - <<: *test-apache-image
       name: "Run testing for MySQL"
-      env: DB=mysql:latest
+      env: DB=mysql:latest
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -62,21 +62,16 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION %%VERSION%%
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-ARG BUILD_DATE
-ARG VCS_REF
 
-LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
     org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
     org.opencontainers.image.vendor="phpMyAdmin" \
     org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
     org.opencontainers.image.licenses="GPL-2.0-only" \
     org.opencontainers.image.version="${VERSION}" \
     org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
-    org.opencontainers.image.revision="${VCS_REF}" \
-    org.opencontainers.image.created="${BUILD_DATE}"
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \
@@ -101,8 +96,6 @@ RUN set -ex; \
     rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
     rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
     sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-
-# Add directory for sessions to allow session persistence
     apk del --no-network .fetch-deps
 
 # Copy configuration
diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -64,21 +64,16 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION %%VERSION%%
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-ARG BUILD_DATE
-ARG VCS_REF
 
-LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
     org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
     org.opencontainers.image.vendor="phpMyAdmin" \
     org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
     org.opencontainers.image.licenses="GPL-2.0-only" \
     org.opencontainers.image.version="${VERSION}" \
     org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
-    org.opencontainers.image.revision="${VCS_REF}" \
-    org.opencontainers.image.created="${BUILD_DATE}"
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \
@@ -108,7 +103,6 @@ RUN set -ex; \
     rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
     rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
     sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-# Add directory for sessions to allow session persistence
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
diff --git a/apache/Dockerfile b/apache/Dockerfile
@@ -64,21 +64,16 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION 5.0.2
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-ARG BUILD_DATE
-ARG VCS_REF
 
-LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
     org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
     org.opencontainers.image.vendor="phpMyAdmin" \
     org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
     org.opencontainers.image.licenses="GPL-2.0-only" \
     org.opencontainers.image.version="${VERSION}" \
     org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
-    org.opencontainers.image.revision="${VCS_REF}" \
-    org.opencontainers.image.created="${BUILD_DATE}"
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \
@@ -108,7 +103,6 @@ RUN set -ex; \
     rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
     rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
     sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-# Add directory for sessions to allow session persistence
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
@@ -1,20 +1,5 @@
 #!/bin/bash
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-    if [ "$(id -u)" = '0' ]; then
-        case "$1" in
-            apache2*)
-                user="${APACHE_RUN_USER:-www-data}"
-                group="${APACHE_RUN_GROUP:-www-data}"
-                ;;
-            *) # php-fpm
-                user='www-data'
-                group='www-data'
-                ;;
-        esac
-    else
-        user="$(id -u)"
-        group="$(id -g)"
-    fi
 
     if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
         cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
@@ -49,7 +34,7 @@ if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
     echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
 fi
 
-function get_docker_secret() {
+get_docker_secret() {
     local env_var="${1}"
     local env_var_file="${env_var}_FILE"
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -1,20 +1,5 @@
 #!/bin/bash
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-    if [ "$(id -u)" = '0' ]; then
-        case "$1" in
-            apache2*)
-                user="${APACHE_RUN_USER:-www-data}"
-                group="${APACHE_RUN_GROUP:-www-data}"
-                ;;
-            *) # php-fpm
-                user='www-data'
-                group='www-data'
-                ;;
-        esac
-    else
-        user="$(id -u)"
-        group="$(id -g)"
-    fi
 
     if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
         cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
@@ -49,7 +34,7 @@ if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
     echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
 fi
 
-function get_docker_secret() {
+get_docker_secret() {
     local env_var="${1}"
     local env_var_file="${env_var}_FILE"
 
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
@@ -62,21 +62,16 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION 5.0.2
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-ARG BUILD_DATE
-ARG VCS_REF
 
-LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
     org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
     org.opencontainers.image.vendor="phpMyAdmin" \
     org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
     org.opencontainers.image.licenses="GPL-2.0-only" \
     org.opencontainers.image.version="${VERSION}" \
     org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
-    org.opencontainers.image.revision="${VCS_REF}" \
-    org.opencontainers.image.created="${BUILD_DATE}"
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \
@@ -101,8 +96,6 @@ RUN set -ex; \
     rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
     rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
     sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-
-# Add directory for sessions to allow session persistence
     apk del --no-network .fetch-deps
 
 # Copy configuration
diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
@@ -1,20 +1,5 @@
 #!/bin/bash
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-    if [ "$(id -u)" = '0' ]; then
-        case "$1" in
-            apache2*)
-                user="${APACHE_RUN_USER:-www-data}"
-                group="${APACHE_RUN_GROUP:-www-data}"
-                ;;
-            *) # php-fpm
-                user='www-data'
-                group='www-data'
-                ;;
-        esac
-    else
-        user="$(id -u)"
-        group="$(id -g)"
-    fi
 
     if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
         cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
@@ -49,7 +34,7 @@ if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
     echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
 fi
 
-function get_docker_secret() {
+get_docker_secret() {
     local env_var="${1}"
     local env_var_file="${env_var}_FILE"
 
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
@@ -64,21 +64,16 @@ RUN set -ex; \
 # Calculate download URL
 ENV VERSION 5.0.2
 ENV URL https://files.phpmyadmin.net/phpMyAdmin/${VERSION}/phpMyAdmin-${VERSION}-all-languages.tar.xz
-ARG BUILD_DATE
-ARG VCS_REF
 
-LABEL maintainer="The phpMyAdmin Team <developers@phpmyadmin.net>" \
-    org.opencontainers.image.title="Official phpMyAdmin Docker image" \
+LABEL org.opencontainers.image.title="Official phpMyAdmin Docker image" \
     org.opencontainers.image.description="Run phpMyAdmin with Alpine, Apache and PHP FPM." \
     org.opencontainers.image.authors="The phpMyAdmin Team <developers@phpmyadmin.net>" \
     org.opencontainers.image.vendor="phpMyAdmin" \
     org.opencontainers.image.documentation="https://github.com/phpmyadmin/docker#readme" \
     org.opencontainers.image.licenses="GPL-2.0-only" \
     org.opencontainers.image.version="${VERSION}" \
     org.opencontainers.image.url="https://github.com/phpmyadmin/docker#readme" \
-    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git" \
-    org.opencontainers.image.revision="${VCS_REF}" \
-    org.opencontainers.image.created="${BUILD_DATE}"
+    org.opencontainers.image.source="https://github.com/phpmyadmin/docker.git"
 
 # Download tarball, verify it using gpg and extract
 RUN set -ex; \
@@ -108,7 +103,6 @@ RUN set -ex; \
     rm -r "$GNUPGHOME" phpMyAdmin.tar.xz phpMyAdmin.tar.xz.asc; \
     rm -rf /var/www/html/setup/ /var/www/html/examples/ /var/www/html/test/ /var/www/html/po/ /var/www/html/composer.json /var/www/html/RELEASE-DATE-$VERSION; \
     sed -i "s@define('CONFIG_DIR'.*@define('CONFIG_DIR', '/etc/phpmyadmin/');@" /var/www/html/libraries/vendor_config.php; \
-# Add directory for sessions to allow session persistence
     \
     apt-mark auto '.*' > /dev/null; \
     apt-mark manual $savedAptMark; \
diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
@@ -1,20 +1,5 @@
 #!/bin/bash
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
-    if [ "$(id -u)" = '0' ]; then
-        case "$1" in
-            apache2*)
-                user="${APACHE_RUN_USER:-www-data}"
-                group="${APACHE_RUN_GROUP:-www-data}"
-                ;;
-            *) # php-fpm
-                user='www-data'
-                group='www-data'
-                ;;
-        esac
-    else
-        user="$(id -u)"
-        group="$(id -g)"
-    fi
 
     if [ ! -f /etc/phpmyadmin/config.secret.inc.php ]; then
         cat > /etc/phpmyadmin/config.secret.inc.php <<EOT
@@ -49,7 +34,7 @@ if [ ! -z "${PMA_USER_CONFIG_BASE64}" ]; then
     echo "${PMA_USER_CONFIG_BASE64}" | base64 -d > /etc/phpmyadmin/config.user.inc.php
 fi
 
-function get_docker_secret() {
+get_docker_secret() {
     local env_var="${1}"
     local env_var_file="${env_var}_FILE"
 
diff --git a/hooks/build b/hooks/build
@@ -1,6 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # This file is used by docker hub to build the image
 
-docker build --build-arg VCS_REF=`git rev-parse HEAD` \
-    --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
-    -t $IMAGE_NAME .
+docker build -t $IMAGE_NAME .
