Merge pull request #557 from infosiftr/wp-config-docker.php

Add new "wp-config-docker.php" that uses "getenv" for configuration
docker-library · Jan 7, 2021 · e7f2ca6 · e7f2ca6
2 parents f6444fd + 8f5bcc1
commit e7f2ca6
Show file tree

Hide file tree

Showing 24 changed files with 1,113 additions and 1,333 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
 /*/**/Dockerfile            linguist-generated
 /*/**/docker-entrypoint.sh  linguist-generated
+/*/**/wp-config-docker.php  linguist-generated
 /Dockerfile.template        linguist-language=Dockerfile
diff --git a/Dockerfile.template b/Dockerfile.template
@@ -229,6 +229,9 @@ RUN set -ex; \
 
 VOLUME /var/www/html
 
+{{ if env.version == "beta" then ( -}}
+COPY --chown=www-data:www-data wp-config-docker.php /usr/src/wordpress/
+{{ ) else "" end -}}
 COPY docker-entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["docker-entrypoint.sh"]

diff --git a/apply-templates.sh b/apply-templates.sh
@@ -52,6 +52,9 @@ for version; do
 
 			if [ "$version" = 'cli' ]; then
 				cp -a cli-entrypoint.sh "$dir/docker-entrypoint.sh"
+			elif [ "$version" = 'beta' ]; then
+				cp -a docker-entrypoint-ng.sh "$dir/docker-entrypoint.sh"
+				cp -a wp-config-docker.php "$dir/"
 			else
 				cp -a docker-entrypoint.sh "$dir/"
 			fi

diff --git a/beta/php7.3/apache/Dockerfile b/beta/php7.3/apache/Dockerfile
diff --git a/beta/php7.3/apache/docker-entrypoint.sh b/beta/php7.3/apache/docker-entrypoint.sh