diff --git a/bitnami/phpmyadmin/4/ol-7/Dockerfile b/bitnami/phpmyadmin/4/ol-7/Dockerfile index e36d6a78d757..e24701e78330 100644 --- a/bitnami/phpmyadmin/4/ol-7/Dockerfile +++ b/bitnami/phpmyadmin/4/ol-7/Dockerfile @@ -1,4 +1,4 @@ -FROM bitnami/oraclelinux-extras:7-r471 +FROM bitnami/oraclelinux-extras:7-r472 LABEL maintainer "Bitnami " # Install required system packages and dependencies @@ -7,16 +7,10 @@ RUN bitnami-pkg unpack apache-2.4.41-1 --checksum 64b7880c3d0f0f9e7cde0e71496eed RUN bitnami-pkg unpack php-7.3.9-1 --checksum d12b49a00eb74dae3b46b4c5b57c9709e79e3157ddd26959c8ca08e919265bb7 RUN bitnami-pkg install libphp-7.3.9-0 --checksum d571181cffcf99e28bf1a53f5664136b391f99996f1471ab426aa73e6f09eed2 RUN bitnami-pkg unpack phpmyadmin-4.9.0-1-1 --checksum 3e4e5d989ae22bf94e2f64ac03359262b5c4fa4d407fed47e9ce78d72e518d04 -RUN ln -sf /dev/stdout /opt/bitnami/apache/logs/access_log -RUN ln -sf /dev/stderr /opt/bitnami/apache/logs/error_log COPY rootfs / -ENV APACHE_HTTPS_PORT_NUMBER="" \ - APACHE_HTTP_PORT_NUMBER="" \ - APACHE_SET_HTTPS_PORT="no" \ - APACHE_SET_HTTP_PORT="no" \ - BITNAMI_APP_NAME="phpmyadmin" \ - BITNAMI_IMAGE_VERSION="4.9.0-1-ol-7-r108" \ +ENV BITNAMI_APP_NAME="phpmyadmin" \ + BITNAMI_IMAGE_VERSION="4.9.0-1-ol-7-r109" \ DATABASE_ENABLE_SSL="no" \ DATABASE_HOST="mariadb" \ DATABASE_PORT_NUMBER="3306" \ @@ -31,9 +25,7 @@ ENV APACHE_HTTPS_PORT_NUMBER="" \ PHPMYADMIN_ALLOW_NO_PASSWORD="true" \ REQUIRE_LOCAL="no" -VOLUME [ "/certs" ] - EXPOSE 80 443 ENTRYPOINT [ "/app-entrypoint.sh" ] -CMD [ "httpd", "-f", "/opt/bitnami/apache/conf/httpd.conf", "-DFOREGROUND" ] +CMD [ "nami", "start", "--foreground", "apache" ] diff --git a/bitnami/phpmyadmin/4/ol-7/rootfs/apache-init.sh b/bitnami/phpmyadmin/4/ol-7/rootfs/apache-init.sh deleted file mode 100644 index 940efb6d8576..000000000000 --- a/bitnami/phpmyadmin/4/ol-7/rootfs/apache-init.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# Check whether Apache ports must be configured -if [[ -n "${APACHE_HTTP_PORT_NUMBER:-}" ]]; then - export APACHE_SET_HTTP_PORT="yes" -fi -if [[ -n "${APACHE_HTTPS_PORT_NUMBER:-}" ]]; then - export APACHE_SET_HTTPS_PORT="yes" -fi - -# Copy vhosts file -if [[ "$(ls -A /vhosts 2>/dev/null)" ]]; then - info "Found vhost definitions in /vhosts. Copying them to /opt/bitnami/apache/conf/vhosts" - cp -r /vhosts/* /opt/bitnami/apache/conf/vhosts -fi - -# Mount certificate files -if [[ -d "/opt/bitnami/apache/certs" ]]; then - warn "The directory '/opt/bitnami/apache/certs' was externally mounted. This is a legacy configuration and will be deprecated soon. Please mount certificate files at '/opt/bitnami/apache/conf/bitnami/certs' instead. Find an example at: https://github.com/bitnami/bitnami-docker-apache#using-custom-ssl-certificates" - warn "Restoring certificates at '/opt/bitnami/apache/certs' to '/opt/bitnami/apache/conf/bitnami/certs'..." - rm -rf /opt/bitnami/apache/conf/bitnami/certs - ln -sf /opt/bitnami/apache/certs /opt/bitnami/apache/conf/bitnami/certs -elif [ "$(ls -A /certs 2>/dev/null)" ]; then - info "Mounting certificates files from /certs..." - rm -rf /opt/bitnami/apache/conf/bitnami/certs - ln -sf /certs /opt/bitnami/apache/conf/bitnami/certs -fi diff --git a/bitnami/phpmyadmin/4/ol-7/rootfs/apache-inputs.json b/bitnami/phpmyadmin/4/ol-7/rootfs/apache-inputs.json deleted file mode 100644 index 25e01aaf4e76..000000000000 --- a/bitnami/phpmyadmin/4/ol-7/rootfs/apache-inputs.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "httpPort": "{{$global.env.APACHE_HTTP_PORT_NUMBER}}", - "httpsPort": "{{$global.env.APACHE_HTTPS_PORT_NUMBER}}", - "setHttpPort": "{{$global.env.APACHE_SET_HTTP_PORT}}", - "setHttpsPort": "{{$global.env.APACHE_SET_HTTPS_PORT}}" -} \ No newline at end of file diff --git a/bitnami/phpmyadmin/4/ol-7/rootfs/app-entrypoint.sh b/bitnami/phpmyadmin/4/ol-7/rootfs/app-entrypoint.sh index de6f3ffe6e0c..d840687d74df 100755 --- a/bitnami/phpmyadmin/4/ol-7/rootfs/app-entrypoint.sh +++ b/bitnami/phpmyadmin/4/ol-7/rootfs/app-entrypoint.sh @@ -5,8 +5,7 @@ print_welcome_page -if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "httpd" ]]; then - . /apache-init.sh +if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "/init.sh" ]]; then nami_initialize apache php phpmyadmin info "Starting phpmyadmin... " fi diff --git a/bitnami/phpmyadmin/README.md b/bitnami/phpmyadmin/README.md index ac5db74b3c5d..faf313efa40f 100644 --- a/bitnami/phpmyadmin/README.md +++ b/bitnami/phpmyadmin/README.md @@ -38,7 +38,7 @@ Bitnami containers can be used with [Kubeapps](https://kubeapps.com/) for deploy Learn more about the Bitnami tagging policy and the difference between rolling tags and immutable tags [in our documentation page](https://docs.bitnami.com/containers/how-to/understand-rolling-tags-containers/). -* [`4-ol-7`, `4.9.0-1-ol-7-r108` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.0-1-ol-7-r108/4/ol-7/Dockerfile) +* [`4-ol-7`, `4.9.0-1-ol-7-r109` (4/ol-7/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.0-1-ol-7-r109/4/ol-7/Dockerfile) * [`4-debian-9`, `4.9.0-1-debian-9-r108`, `4`, `4.9.0-1`, `4.9.0-1-r108`, `latest` (4/debian-9/Dockerfile)](https://github.com/bitnami/bitnami-docker-phpmyadmin/blob/4.9.0-1-debian-9-r108/4/debian-9/Dockerfile) Subscribe to project updates by watching the [bitnami/phpmyadmin GitHub repo](https://github.com/bitnami/bitnami-docker-phpmyadmin).