update older dockerfiles

FortAwesome · Jul 13, 2023 · 62787fd · 62787fd
1 parent 2e9bb14
commit 62787fd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 89 deletions.
diff --git a/docker/Dockerfile-4.7 b/docker/Dockerfile-4.7
@@ -1,24 +1,7 @@
 FROM wordpress:4.7
 
-# Install packages
-RUN apt-get update && \
-    apt-get -y install vim subversion mysql-client less
-
-# Install wp-cli
-RUN curl -L -s https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar > /usr/local/bin/wp && chmod +x /usr/local/bin/wp
-
-# Add non-privileged user, best for using wp-cli
-RUN groupadd -r user && useradd --no-log-init -r -g user user
-
-# Install composer
-RUN curl https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
-
-COPY ./install-wp-tests-docker.sh /tmp
-
-RUN /tmp/install-wp-tests-docker.sh 4.7
-
-# Xdebug environment variables
-ENV XDEBUG_PORT 9000
+# No longer including tests and wp-cli in this old version,
+# because the base image is so old now that updating its deps is problematic.
 
 # See: https://github.com/docker-library/wordpress/issues/205
 COPY ./apache2-custom.sh /usr/local/bin/apache2-custom.sh

diff --git a/docker/Dockerfile-4.8 b/docker/Dockerfile-4.8
@@ -1,24 +1,7 @@
 FROM wordpress:4.8
 
-# Install packages
-RUN apt-get update && \
-    apt-get -y install vim subversion mysql-client less
-
-# Install wp-cli
-RUN curl -L -s https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar > /usr/local/bin/wp && chmod +x /usr/local/bin/wp
-
-# Add non-privileged user, best for using wp-cli
-RUN groupadd -r user && useradd --no-log-init -r -g user user
-
-# Install composer
-RUN curl https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
-
-COPY ./install-wp-tests-docker.sh /tmp
-
-RUN /tmp/install-wp-tests-docker.sh 4.8
-
-# Xdebug environment variables
-ENV XDEBUG_PORT 9000
+# No longer including tests and wp-cli in this old version,
+# because the base image is so old now that updating its deps is problematic.
 
 # See: https://github.com/docker-library/wordpress/issues/205
 COPY ./apache2-custom.sh /usr/local/bin/apache2-custom.sh

diff --git a/docker/Dockerfile-4.9 b/docker/Dockerfile-4.9
@@ -1,37 +1,7 @@
 FROM wordpress:4.9
 
-# Install packages
-RUN apt-get update && \
-    apt-get -y install vim subversion mysql-client less
-
-# Install wp-cli
-RUN curl -L -s https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar > /usr/local/bin/wp && chmod +x /usr/local/bin/wp
-
-# Add non-privileged user, best for using wp-cli
-RUN groupadd -r user && useradd --no-log-init -r -g user user
-
-# DEBUG is not set up for 4.9
-# To enable this would require setting up a different docker-php-ext-xdebug.ini
-# that refers to the specific .so file that is installed by by this pecl command.
-# Install xdebug
-#RUN pecl install xdebug
-## Copy in our php.ini debug configuration
-#COPY ./docker-php-ext-xdebug.ini /usr/local/etc/php/conf.d
-
-# Install redis php extension
-# The echo is to avoid the terminal prompt on install
-RUN echo "\n" | pecl install redis
-COPY ./docker-php-ext-redis.ini /usr/local/etc/php/conf.d
-
-# Install composer
-RUN curl https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
-
-COPY ./install-wp-tests-docker.sh /tmp
-
-RUN /tmp/install-wp-tests-docker.sh 4.9 db-4.9:3309
-
-# Xdebug environment variables
-ENV XDEBUG_PORT 9000
+# No longer including tests and wp-cli in this old version,
+# because the base image is so old now that updating its deps is problematic.
 
 # See: https://github.com/docker-library/wordpress/issues/205
 COPY ./apache2-custom.sh /usr/local/bin/apache2-custom.sh

diff --git a/docker/Dockerfile-5.0 b/docker/Dockerfile-5.0
@@ -1,24 +1,7 @@
 FROM wordpress:5.0-php7.3
 
-# Install packages
-RUN apt-get update && \
-    apt-get -y install vim subversion mysql-client less
-
-# Install wp-cli
-RUN curl -L -s https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar > /usr/local/bin/wp && chmod +x /usr/local/bin/wp
-
-# Add non-privileged user, best for using wp-cli
-RUN groupadd -r user && useradd --no-log-init -r -g user user
-
-# Install composer
-RUN curl https://raw.githubusercontent.com/composer/getcomposer.org/76a7060ccb93902cd7576b67264ad91c8a2700e2/web/installer | php -- --quiet && chmod +x composer.phar && mv composer.phar /usr/local/bin/composer
-
-COPY ./install-wp-tests-docker.sh /tmp
-
-RUN /tmp/install-wp-tests-docker.sh 5.0 db-5.0:3307
-
-# Xdebug environment variables
-ENV XDEBUG_PORT 9000
+# No longer including tests and wp-cli in this old version,
+# because the base image is so old now that updating its deps is problematic.
 
 # See: https://github.com/docker-library/wordpress/issues/205
 COPY ./apache2-custom.sh /usr/local/bin/apache2-custom.sh