From 9e8da48eedff3174d4c49b4ddcac536efcc3a882 Mon Sep 17 00:00:00 2001 From: David Gomez Date: Fri, 4 Jan 2019 09:31:01 +0100 Subject: [PATCH] Remove branch 7.0 --- bitnami/php-fpm/7.0/README.md | 3 --- bitnami/php-fpm/7.0/debian-9/Dockerfile | 20 ---------------- .../php-fpm/7.0/debian-9/docker-compose.yml | 10 -------- bitnami/php-fpm/7.0/debian-9/prod/Dockerfile | 14 ----------- bitnami/php-fpm/7.0/ol-7/Dockerfile | 20 ---------------- bitnami/php-fpm/7.0/ol-7/docker-compose.yml | 10 -------- bitnami/php-fpm/7.0/ol-7/prod/Dockerfile | 14 ----------- bitnami/php-fpm/7.0/rhel-7/Dockerfile | 23 ------------------- bitnami/php-fpm/7.0/rhel-7/docker-compose.yml | 10 -------- .../7.0/rhel-7/rootfs/app-entrypoint.sh | 13 ----------- bitnami/php-fpm/README.md | 2 -- 11 files changed, 139 deletions(-) delete mode 100644 bitnami/php-fpm/7.0/README.md delete mode 100644 bitnami/php-fpm/7.0/debian-9/Dockerfile delete mode 100644 bitnami/php-fpm/7.0/debian-9/docker-compose.yml delete mode 100644 bitnami/php-fpm/7.0/debian-9/prod/Dockerfile delete mode 100644 bitnami/php-fpm/7.0/ol-7/Dockerfile delete mode 100644 bitnami/php-fpm/7.0/ol-7/docker-compose.yml delete mode 100644 bitnami/php-fpm/7.0/ol-7/prod/Dockerfile delete mode 100644 bitnami/php-fpm/7.0/rhel-7/Dockerfile delete mode 100644 bitnami/php-fpm/7.0/rhel-7/docker-compose.yml delete mode 100755 bitnami/php-fpm/7.0/rhel-7/rootfs/app-entrypoint.sh diff --git a/bitnami/php-fpm/7.0/README.md b/bitnami/php-fpm/7.0/README.md deleted file mode 100644 index 09efd6ce8dc8..000000000000 --- a/bitnami/php-fpm/7.0/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Deprecation notice - -PHP 7.0.x release series has reached end of life. We strongly recommend using 7.1.x series or higher instead. diff --git a/bitnami/php-fpm/7.0/debian-9/Dockerfile b/bitnami/php-fpm/7.0/debian-9/Dockerfile deleted file mode 100644 index 4bb4791665ba..000000000000 --- a/bitnami/php-fpm/7.0/debian-9/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM bitnami/minideb-runtimes:stretch-php -LABEL maintainer "Bitnami " - -# Install required system packages and dependencies -RUN install_packages ca-certificates libbz2-1.0 libc6 libcomerr2 libcurl3 libffi6 libfreetype6 libgcc1 libgcrypt20 libgmp10 libgnutls30 libgpg-error0 libgssapi-krb5-2 libhogweed4 libicu57 libidn11 libidn2-0 libjpeg62-turbo libk5crypto3 libkeyutils1 libkrb5-3 libkrb5support0 libldap-2.4-2 liblzma5 libmcrypt4 libmemcached11 libmemcachedutil2 libncurses5 libnettle6 libnghttp2-14 libp11-kit0 libpng16-16 libpq5 libpsl5 libreadline7 librtmp1 libsasl2-2 libssh2-1 libssl1.0.2 libssl1.1 libstdc++6 libsybdb5 libtasn1-6 libtidy5 libtinfo5 libunistring0 libxml2 libxslt1.1 wget zlib1g -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/php-7.0.33-21-linux-amd64-debian-9.tar.gz && \ - echo "519f906150604c9d326dde4a0cdcc468cf5f1ee214c56d77773a4bcaf08f5fe5 /tmp/bitnami/pkg/cache/php-7.0.33-21-linux-amd64-debian-9.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/php-7.0.33-21-linux-amd64-debian-9.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/php-7.0.33-21-linux-amd64-debian-9.tar.gz -RUN mkdir -p /bitnami && ln -sf /bitnami/php /bitnami/php-fpm -RUN mkdir /opt/bitnami/php/logs && touch /opt/bitnami/php/logs/php-fpm.log - -ENV BITNAMI_APP_NAME="php-fpm" \ - BITNAMI_IMAGE_VERSION="7.0.33-debian-9-r25" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/php/sbin:$PATH" - -EXPOSE 9000 - -WORKDIR /app -CMD [ "php-fpm", "-F", "--pid", "/opt/bitnami/php/tmp/php-fpm.pid", "-y", "/opt/bitnami/php/etc/php-fpm.conf" ] diff --git a/bitnami/php-fpm/7.0/debian-9/docker-compose.yml b/bitnami/php-fpm/7.0/debian-9/docker-compose.yml deleted file mode 100644 index a04c24a0e51e..000000000000 --- a/bitnami/php-fpm/7.0/debian-9/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '2' - -services: - php: - tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/php-fpm:7.0' - ports: - - 9000:9000 - volumes: - - .:/app diff --git a/bitnami/php-fpm/7.0/debian-9/prod/Dockerfile b/bitnami/php-fpm/7.0/debian-9/prod/Dockerfile deleted file mode 100644 index 14549260b5b2..000000000000 --- a/bitnami/php-fpm/7.0/debian-9/prod/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ - -FROM bitnami/php-fpm:7.0.33-debian-9-r25 as development - -FROM bitnami/minideb-runtimes:stretch-php -LABEL maintainer "Bitnami " - -COPY --from=development /opt/bitnami/common /opt/bitnami/common -COPY --from=development /opt/bitnami/php /opt/bitnami/php - -ENV BITNAMI_APP_NAME="php-fpm" \ - BITNAMI_IMAGE_VERSION="7.0.33-debian-9-r25" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/php/sbin:$PATH" - -CMD [ "php-fpm", "-F", "--pid", "/opt/bitnami/php/tmp/php-fpm.pid", "-y", "/opt/bitnami/php/etc/php-fpm.conf" ] diff --git a/bitnami/php-fpm/7.0/ol-7/Dockerfile b/bitnami/php-fpm/7.0/ol-7/Dockerfile deleted file mode 100644 index 5e42923aa190..000000000000 --- a/bitnami/php-fpm/7.0/ol-7/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM bitnami/oraclelinux-runtimes:7-php -LABEL maintainer "Bitnami " - -# Install required system packages and dependencies -RUN install_packages bzip2-libs ca-certificates cyrus-sasl-lib freetds freetype glibc gmp gnutls keyutils-libs krb5-libs libcom_err libcurl libffi libgcc libgcrypt libgpg-error libicu libidn libjpeg-turbo libmcrypt libmemcached libpng libselinux libssh2 libstdc++ libtasn1 libtidy libxml2 libxslt ncurses-libs nettle nspr nss nss-softokn-freebl nss-util openldap openssl-libs p11-kit pcre postgresql-libs readline wget xz-libs zlib -RUN wget -nc -P /tmp/bitnami/pkg/cache/ https://downloads.bitnami.com/files/stacksmith/php-7.0.33-21-linux-x86_64-ol-7.tar.gz && \ - echo "af557b3e5b053ba69b2fdb8d4b4cfe0f13942349f79c38cb140b849d0a9732ea /tmp/bitnami/pkg/cache/php-7.0.33-21-linux-x86_64-ol-7.tar.gz" | sha256sum -c - && \ - tar -zxf /tmp/bitnami/pkg/cache/php-7.0.33-21-linux-x86_64-ol-7.tar.gz -P --transform 's|^[^/]*/files|/opt/bitnami|' --wildcards '*/files' && \ - rm -rf /tmp/bitnami/pkg/cache/php-7.0.33-21-linux-x86_64-ol-7.tar.gz -RUN mkdir -p /bitnami && ln -sf /bitnami/php /bitnami/php-fpm -RUN mkdir /opt/bitnami/php/logs && touch /opt/bitnami/php/logs/php-fpm.log - -ENV BITNAMI_APP_NAME="php-fpm" \ - BITNAMI_IMAGE_VERSION="7.0.33-ol-7-r24" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/php/sbin:$PATH" - -EXPOSE 9000 - -WORKDIR /app -CMD [ "php-fpm", "-F", "--pid", "/opt/bitnami/php/tmp/php-fpm.pid", "-y", "/opt/bitnami/php/etc/php-fpm.conf" ] diff --git a/bitnami/php-fpm/7.0/ol-7/docker-compose.yml b/bitnami/php-fpm/7.0/ol-7/docker-compose.yml deleted file mode 100644 index 4f89773b6137..000000000000 --- a/bitnami/php-fpm/7.0/ol-7/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '2' - -services: - php: - tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/php-fpm:7.0-ol-7' - ports: - - 9000:9000 - volumes: - - .:/app diff --git a/bitnami/php-fpm/7.0/ol-7/prod/Dockerfile b/bitnami/php-fpm/7.0/ol-7/prod/Dockerfile deleted file mode 100644 index 09d51f9b7bf2..000000000000 --- a/bitnami/php-fpm/7.0/ol-7/prod/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ - -FROM bitnami/php-fpm:7.0.33-ol-7-r24 as development - -FROM bitnami/oraclelinux-runtimes:7-php -LABEL maintainer "Bitnami " - -COPY --from=development /opt/bitnami/common /opt/bitnami/common -COPY --from=development /opt/bitnami/php /opt/bitnami/php - -ENV BITNAMI_APP_NAME="php-fpm" \ - BITNAMI_IMAGE_VERSION="7.0.33-ol-7-r24" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/php/sbin:$PATH" - -CMD [ "php-fpm", "-F", "--pid", "/opt/bitnami/php/tmp/php-fpm.pid", "-y", "/opt/bitnami/php/etc/php-fpm.conf" ] diff --git a/bitnami/php-fpm/7.0/rhel-7/Dockerfile b/bitnami/php-fpm/7.0/rhel-7/Dockerfile deleted file mode 100644 index 226ed2327ea5..000000000000 --- a/bitnami/php-fpm/7.0/rhel-7/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -FROM registry.rhc4tp.openshift.com/bitnami/rhel-extras-7:latest -LABEL maintainer "Bitnami " - -ENV BITNAMI_PKG_CHMOD="-R g+rwX" \ - HOME="/" - -# Install required system packages and dependencies -RUN install_packages bzip2-libs cyrus-sasl-lib freetype glibc gmp keyutils-libs krb5-libs libcom_err libcurl libgcc libgcrypt libgpg-error libicu libidn libjpeg-turbo libmemcached libpng libselinux libssh2 libstdc++ libxml2 libxslt ncurses-libs nspr nss nss-softokn-freebl nss-util openldap openssl-libs pcre postgresql-libs readline xz-libs zlib -RUN bitnami-pkg unpack php-7.0.33-1 --checksum 79b096f9e5feddc15cc8565b0c1cf71b982f79dcc0c8dca9790c48de83e0228e -RUN mkdir -p /bitnami && ln -sf /bitnami/php /bitnami/php-fpm - -COPY rootfs / -ENV BITNAMI_APP_NAME="php-fpm" \ - BITNAMI_IMAGE_VERSION="7.0.33-rhel-7-r14" \ - NAMI_PREFIX="/.nami" \ - PATH="/opt/bitnami/php/bin:/opt/bitnami/php/sbin:/opt/bitnami/php/sbin:$PATH" - -EXPOSE 9000 - -WORKDIR /app -USER 1001 -ENTRYPOINT [ "/app-entrypoint.sh" ] -CMD [ "php-fpm", "-F", "--pid", "/opt/bitnami/php/tmp/php-fpm.pid", "-y", "/opt/bitnami/php/etc/php-fpm.conf" ] diff --git a/bitnami/php-fpm/7.0/rhel-7/docker-compose.yml b/bitnami/php-fpm/7.0/rhel-7/docker-compose.yml deleted file mode 100644 index 3fe9a017e697..000000000000 --- a/bitnami/php-fpm/7.0/rhel-7/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -version: '2' - -services: - php: - tty: true # Enables debugging capabilities when attached to this container. - image: 'bitnami/php-fpm:7.0-rhel-7' - ports: - - 9000:9000 - volumes: - - .:/app diff --git a/bitnami/php-fpm/7.0/rhel-7/rootfs/app-entrypoint.sh b/bitnami/php-fpm/7.0/rhel-7/rootfs/app-entrypoint.sh deleted file mode 100755 index d776a83c836a..000000000000 --- a/bitnami/php-fpm/7.0/rhel-7/rootfs/app-entrypoint.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -e - -. /opt/bitnami/base/functions -. /opt/bitnami/base/helpers - -print_welcome_page - -if [[ "$1" == "nami" && "$2" == "start" ]] || [[ "$1" == "php-fpm" ]]; then - nami_initialize php - info "Starting php... " -fi - -exec tini -- "$@" diff --git a/bitnami/php-fpm/README.md b/bitnami/php-fpm/README.md index 6e4bc6c3ee11..1f69e517f195 100644 --- a/bitnami/php-fpm/README.md +++ b/bitnami/php-fpm/README.md @@ -71,8 +71,6 @@ Subscribe to project updates by watching the [bitnami/php-fpm GitHub repo](https # Get this image -**NOTE: PHP 7.0.x release series has reached end of life. We strongly recommend using 7.1.x series or higher instead.** - The recommended way to get the Bitnami PHP-FPM Docker Image is to pull the prebuilt image from the [Docker Hub Registry](https://hub.docker.com/r/bitnami/php-fpm). ```bash