From b64866257c4cd9c78c08fcf6aa59568ceb385448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Alejandro=20Mart=C3=ADnez=20Faneyth?= Date: Mon, 24 Jun 2019 15:17:45 -0400 Subject: [PATCH] [FIX] Fixing build. --- README.md.template | 9 +++++++++ build-image.sh | 10 ++++++++-- php/docker-entrypoint.sh | 0 3 files changed, 17 insertions(+), 2 deletions(-) mode change 100644 => 100755 php/docker-entrypoint.sh diff --git a/README.md.template b/README.md.template index fbd23562..98b1cf77 100644 --- a/README.md.template +++ b/README.md.template @@ -92,6 +92,15 @@ These images are similar to the official ones, but with some improved configurat ![](https://cdn.rawgit.com/LuisAlejandro/dockershelf/master/images/table.svg) +### PHP + + +|Image |Release |Dockerfile |Layers |Size | +|-------|---------|------------|--------|------| +%%PHP_TABLE%% + +![](https://cdn.rawgit.com/LuisAlejandro/dockershelf/master/images/table.svg) + ## How to download Pull one of the available images and start hacking! diff --git a/build-image.sh b/build-image.sh index 72667881..a38e9f3c 100644 --- a/build-image.sh +++ b/build-image.sh @@ -91,11 +91,17 @@ if [ "${DOCKER_IMAGE_TYPE}" == "mongo" ]; then cp "${DOCKER_IMAGE_TYPE_DIR}/articles.js" "${DOCKER_IMAGE_DIR}" fi -# Copy entrypoint if we are building Postgres or PHP -if [ "${DOCKER_IMAGE_TYPE}" == "postgres" ] || [ "${DOCKER_IMAGE_TYPE}" == "php" ]; then +# Copy entrypoint if we are building Postgres +if [ "${DOCKER_IMAGE_TYPE}" == "postgres" ]; then cp "${DOCKER_IMAGE_TYPE_DIR}/docker-entrypoint.sh" "${DOCKER_IMAGE_DIR}" fi +# Copy entrypoint if we are building PHP +if [ "${DOCKER_IMAGE_TYPE}" == "php" ]; then + cp "${DOCKER_IMAGE_TYPE_DIR}/docker-entrypoint.sh" "${DOCKER_IMAGE_DIR}" + cp "${DOCKER_IMAGE_TYPE_DIR}/apache2-foreground" "${DOCKER_IMAGE_DIR}" +fi + # Copy latex sample if we are building Latex if [ "${DOCKER_IMAGE_TYPE}" == "latex" ]; then cp "${DOCKER_IMAGE_TYPE_DIR}/sample.tex" "${DOCKER_IMAGE_DIR}" diff --git a/php/docker-entrypoint.sh b/php/docker-entrypoint.sh old mode 100644 new mode 100755